]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5559c02 3184a62)
Merge branch 'develop' of https://github.com/friendica/friendica into develop
authorSilke Meyer <silke@silkemeyer.net>
Wed, 2 Mar 2016 19:45:41 +0000 (20:45 +0100)
committerSilke Meyer <silke@silkemeyer.net>
Wed, 2 Mar 2016 19:45:41 +0000 (20:45 +0100)

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