projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 670dba6 777c47a)
Merge branch 'friendika-master'
authorfabrixxm <fabrix.xm@gmail.com>
Wed, 2 Feb 2011 07:00:50 +0000 (08:00 +0100)
committerfabrixxm <fabrix.xm@gmail.com>
Wed, 2 Feb 2011 07:00:50 +0000 (08:00 +0100)

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