]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f7f9ff 7a79ac9)
Merge branch 'develop' of https://github.com/friendica/friendica into develop
authorRalf Thees <ralf@herrthees.de>
Sat, 20 Oct 2018 08:50:36 +0000 (10:50 +0200)
committerRalf Thees <ralf@herrthees.de>
Sat, 20 Oct 2018 08:50:36 +0000 (10:50 +0200)

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