]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eadeb3e 21fecb9)
Merge remote-tracking branch 'upstream/develop' into develop
authorSilke Meyer <silke@silkemeyer.net>
Wed, 4 Oct 2017 19:28:35 +0000 (21:28 +0200)
committerSilke Meyer <silke@silkemeyer.net>
Wed, 4 Oct 2017 19:28:35 +0000 (21:28 +0200)

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