Merge remote-tracking branch 'upstream/develop' into 1611-frontend

This commit is contained in:
Michael 2016-11-30 04:46:47 +00:00
commit 1f50dc368e

View file

@ -8,6 +8,8 @@
* friend requests. * friend requests.
* *
* @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf * @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf
* You also find a graphic which describes the confirmation process at
* https://github.com/friendica/friendica/blob/master/spec/dfrn2_contact_request.png
*/ */
require_once('include/enotify.php'); require_once('include/enotify.php');