]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f6fd8e 2bfa870)
Merge branch 'master' into develop
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Sun, 12 Mar 2017 13:39:09 +0000 (14:39 +0100)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Sun, 12 Mar 2017 13:39:09 +0000 (14:39 +0100)

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