Merge branch 'master' into docs-5.1

2018-04-16 09:58:46 +02:00
parent 48143d6caf 738fb29134
commit 92ac1fbb5b
101 changed files with 1077 additions and 712 deletions
@@ -307,7 +307,7 @@ Content-Type: application/json

 `PUT /api/orgs/:orgId`

-Update Organisation, fields *Adress 1*, *Adress 2*, *City* are not implemented yet.
+Update Organisation, fields *Address 1*, *Address 2*, *City* are not implemented yet.

 **Example Request**:

@@ -436,4 +436,4 @@ HTTP/1.1 200
 Content-Type: application/json

 {"message":"User removed from organization"}
-```
+```