]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b2df120 dd2ff7c)
Merge branch 'master' of git://github.com/friendica/friendica
authorAlexander Kampmann <programmer@nurfuerspam.de>
Wed, 7 Mar 2012 11:06:20 +0000 (12:06 +0100)
committerAlexander Kampmann <programmer@nurfuerspam.de>
Wed, 7 Mar 2012 11:06:20 +0000 (12:06 +0100)

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