Merge branch 'master' into managed-server

nextcloud · Jul 25, 2017 · 0f96a7b · 0f96a7b
2 parents e8c3cdc + 19ff5d8
commit 0f96a7b
Show file tree

Hide file tree

Showing 44 changed files with 2,389 additions and 697 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,8 +19,6 @@ matrix:
       env: DB=sqlite
     - php: 5.6
       env: DB=pgsql
-    - php: 5.6
-      env: DB=mysql BRANCH=stable9
     - php: 5.6
       env: DB=mysql BRANCH=stable10
     - php: 5.6

diff --git a/ajax/externalApi.php b/ajax/externalApi.php
diff --git a/ajax/getSettings.php b/ajax/getSettings.php
diff --git a/ajax/getTurnCredentials.php b/ajax/getTurnCredentials.php
diff --git a/ajax/getUsers.php b/ajax/getUsers.php