Merge branch 'master' into develop

This commit is contained in:
Benjamin Neff 2018-03-29 07:02:39 +02:00
commit 97888067e6
No known key found for this signature in database
GPG key ID: 971464C3F1A90194

View file

@ -22,4 +22,4 @@ The [Friendica][friendica] project also has [its implementation in PHP][phpimple
[entities]: {{ site.baseurl }}/entities/
[github]: https://github.com/diaspora/diaspora_federation
[friendica]: https://github.com/friendica/friendica
[phpimplementation]: https://github.com/friendica/friendica/blob/master/include/diaspora.php
[phpimplementation]: https://github.com/friendica/friendica/blob/develop/src/Protocol/Diaspora.php