projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 77bc4cd 3d1dd3a)
Merge branch 'master' of https://github.com/friendica/friendica
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Sat, 16 Feb 2013 10:03:56 +0000 (11:03 +0100)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Sat, 16 Feb 2013 10:03:56 +0000 (11:03 +0100)

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