]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a4dd0b8 76abade)
Merge branch 'develop' of https://github.com/friendica/friendica into develop
authorSilke Meyer <silke@silkemeyer.net>
Fri, 17 Jun 2016 16:36:38 +0000 (18:36 +0200)
committerSilke Meyer <silke@silkemeyer.net>
Fri, 17 Jun 2016 16:36:38 +0000 (18:36 +0200)

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