projects / friendica-addons.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9bbadf9 8e06a84)
Merge remote branch 'friendica/master'
authorfabrixxm <fabrix.xm@gmail.com>
Wed, 18 Jul 2012 10:31:16 +0000 (06:31 -0400)
committerfabrixxm <fabrix.xm@gmail.com>
Wed, 18 Jul 2012 10:31:16 +0000 (06:31 -0400)

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