Merge branch 'develop' into improvement/move-app-to-src-2

2017-05-07 12:58:11 -04:00
parent 87b513dd03 12cc5f8360
commit 86cae070f2
21 changed files with 5720 additions and 5348 deletions
--- a/doc/api.md
+++ b/doc/api.md
@@ -172,6 +172,11 @@ On error:
 HTTP 400 BadRequest
 * on friendica_verbose=true: different JSON returns {"result":"error","message":"xyz"}

+---
+### externalprofile/show (*)
+#### Parameters
+* profileurl: profile url
+
 ---
 ### favorites (*; AUTH)
 #### Parameters