]> git.mxchange.org Git - friendica-addons.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 19 Mar 2012 01:17:42 +0000 (21:17 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 19 Mar 2012 01:17:42 +0000 (21:17 -0400)
commit141bac1714f0ce6f3ea072f31acaf33a9185819b
tree1e2c3533ec303992ea4a9f8a0722955d5bc5f5ac
parentd9786544f4ec2b1f2da602633fe19c10e06664f5
parent20ab0c68afabe01401baee762e9d7588cb6d5995
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  not yet linked adult_smiles
  pkg update
  deleted:    smiley_pack/smiley_pack.php~
  First set of smilies for smiley_pack

* master: