]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 018727a 71edd68)
Merge branch 'master' of https://github.com/friendica/friendica
authorAlexander Kampmann <programmer@nurfuerspam.de>
Mon, 9 Apr 2012 14:56:37 +0000 (16:56 +0200)
committerAlexander Kampmann <programmer@nurfuerspam.de>
Mon, 9 Apr 2012 14:56:37 +0000 (16:56 +0200)

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