]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 808eaa6 a718b0d)
Merge branch 'develop' of https://github.com/friendica/friendica into develop
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Tue, 10 Nov 2015 19:10:20 +0000 (20:10 +0100)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Tue, 10 Nov 2015 19:10:20 +0000 (20:10 +0100)

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