]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f95ba5 bb5ad77)
Merge branch 'friendika-master'
authorfabrixxm <fabrix.xm@gmail.com>
Tue, 25 Jan 2011 18:03:41 +0000 (19:03 +0100)
committerfabrixxm <fabrix.xm@gmail.com>
Tue, 25 Jan 2011 18:03:41 +0000 (19:03 +0100)

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