]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b9fa3f 44cb02f)
Merge branch 'develop' of https://github.com/friendica/friendica into develop
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Sun, 8 Nov 2015 11:37:17 +0000 (12:37 +0100)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Sun, 8 Nov 2015 11:37:17 +0000 (12:37 +0100)

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