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

2016-11-30 04:46:47 +00:00 · 2016-11-30 04:46:47 +00:00 · 1f50dc368e
commit 1f50dc368e
parent cc5eebd173 d620c5d996
1 changed files with 2 additions and 0 deletions
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@ -8,6 +8,8 @@
 * friend requests.
 *
 * @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');