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/appinfo | |
| 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/appinfo')
| -rw-r--r-- | apps/provisioning_api/appinfo/app.php | 2 | ||||
| -rw-r--r-- | apps/provisioning_api/appinfo/routes.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/apps/provisioning_api/appinfo/app.php b/apps/provisioning_api/appinfo/app.php index bb5c541c4fd..40d8d5d04d3 100644 --- a/apps/provisioning_api/appinfo/app.php +++ b/apps/provisioning_api/appinfo/app.php @@ -1,6 +1,6 @@ <?php /** - * @author Tom Needham <tom@owncloud.com> + * * @copyright Copyright (c) 2015, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/provisioning_api/appinfo/routes.php b/apps/provisioning_api/appinfo/routes.php index 77a44cd85b6..17cfea26572 100644 --- a/apps/provisioning_api/appinfo/routes.php +++ b/apps/provisioning_api/appinfo/routes.php @@ -2,6 +2,7 @@ /** * @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> * * @copyright Copyright (c) 2015, ownCloud, Inc. |