]> git.mxchange.org Git - friendica-addons.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Wed, 21 Mar 2012 01:41:53 +0000 (21:41 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Wed, 21 Mar 2012 01:41:53 +0000 (21:41 -0400)
commit6abe6b0a65aed03146bc3a14f160f81aa64326bb
treed1861c1e918b74ab50479eafb35fff091cd2f635
parenta649c1966d8b2ab053dad7549f1213939bf066ad
parente4aa572a2522f97446f59abde0e0ce0b4372d045
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  updated default profile photo
  modified:   smiley_pack/smiley_pack.php
  clean up

* master: