projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5605bb6 631afe5)
Merge branch 'develop' of https://github.com/friendica/friendica into develop
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Sun, 8 Nov 2015 15:04:50 +0000 (16:04 +0100)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Sun, 8 Nov 2015 15:04:50 +0000 (16:04 +0100)

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