]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a763a06 aaadabf)
Merge branch 'master' of https://github.com/friendica/friendica
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Tue, 14 Aug 2012 10:38:06 +0000 (12:38 +0200)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Tue, 14 Aug 2012 10:38:06 +0000 (12:38 +0200)

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