projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0218d16 e3584da)
Merge branch 'develop' of https://github.com/friendica/friendica into develop
authorPhilipp Holzer <admin@philipp.info>
Tue, 26 Jun 2018 20:56:08 +0000 (22:56 +0200)
committerPhilipp Holzer <admin@philipp.info>
Tue, 26 Jun 2018 20:56:08 +0000 (22:56 +0200)

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