https://reisub.nsupdate.info/git / friendica.git / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2f8673 74ca1fa)
Merge branch 'develop' of https://github.com/friendica/friendica into develop
authorSilke Meyer <silke@silkemeyer.net>
Sat, 12 Nov 2016 09:05:46 +0000 (10:05 +0100)
committerSilke Meyer <silke@silkemeyer.net>
Sat, 12 Nov 2016 09:05:46 +0000 (10:05 +0100)

Trivial merge
mirror https://github.com/friendica/friendica.git