]> git.mxchange.org Git - friendica-addons.git/commitdiff
projects / friendica-addons.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a649c19 e4aa572)
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)
* remotes/upstream/master:
  updated default profile photo
  modified:   smiley_pack/smiley_pack.php
  clean up

* master:


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.