]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2370b5 d83bfd4)
Merge branch 'master' of https://github.com/friendica/friendica
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Fri, 30 Mar 2012 06:12:28 +0000 (08:12 +0200)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Fri, 30 Mar 2012 06:12:28 +0000 (08:12 +0200)

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