diff options
| author | michag86 <micha_g@arcor.de> | 2015-10-13 14:40:22 +0200 |
|---|---|---|
| committer | michag86 <micha_g@arcor.de> | 2015-10-13 14:40:22 +0200 |
| commit | 23db51f69a2708949d438ba120c1666aae65c42d (patch) | |
| tree | b9b833dcaaa584a80150a69482448d93286ce909 /apps/provisioning_api/tests | |
| parent | ef3aa1218eab7f4c50758d0d359c383eae4a3e95 (diff) | |
| parent | 3f083353c10f92788613d0de9a89f428f7970940 (diff) | |
| download | nextcloud-server-23db51f69a2708949d438ba120c1666aae65c42d.tar.gz nextcloud-server-23db51f69a2708949d438ba120c1666aae65c42d.zip | |
Merge branch 'master' into api-getusers-for-subadmins
Diffstat (limited to 'apps/provisioning_api/tests')
| -rw-r--r-- | apps/provisioning_api/tests/appstest.php | 2 | ||||
| -rw-r--r-- | apps/provisioning_api/tests/groupstest.php | 2 | ||||
| -rw-r--r-- | apps/provisioning_api/tests/testcase.php | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/apps/provisioning_api/tests/appstest.php b/apps/provisioning_api/tests/appstest.php index f2a3977eac4..2baea5bbc8c 100644 --- a/apps/provisioning_api/tests/appstest.php +++ b/apps/provisioning_api/tests/appstest.php @@ -2,8 +2,8 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author Roeland Jago Douma <roeland@famdouma.nl> * @author Tom Needham <tom@owncloud.com> - * @author Vincent Petry <pvince81@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/provisioning_api/tests/groupstest.php b/apps/provisioning_api/tests/groupstest.php index 73044e33120..4afd246abcd 100644 --- a/apps/provisioning_api/tests/groupstest.php +++ b/apps/provisioning_api/tests/groupstest.php @@ -2,8 +2,8 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author Roeland Jago Douma <roeland@famdouma.nl> * @author Tom Needham <tom@owncloud.com> - * @author Vincent Petry <pvince81@owncloud.com> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/provisioning_api/tests/testcase.php b/apps/provisioning_api/tests/testcase.php index ee7eb2a5a9a..cc8f5c1d16d 100644 --- a/apps/provisioning_api/tests/testcase.php +++ b/apps/provisioning_api/tests/testcase.php @@ -2,6 +2,7 @@ /** * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> + * @author Roeland Jago Douma <roeland@famdouma.nl> * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 |