summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2016-07-21 18:13:36 +0200
committerJoas Schilling <coding@schilljs.com>2016-07-21 18:13:58 +0200
commit0215b004da6af887b3e3efa28c425d41a1c76b9b (patch)
tree85eb9718f671a8c705627d206b605d847960dd09 /core
parentba87db3fccb40aa58d84d12932424c83a4db411f (diff)
downloadnextcloud-server-0215b004da6af887b3e3efa28c425d41a1c76b9b.tar.gz
nextcloud-server-0215b004da6af887b3e3efa28c425d41a1c76b9b.zip
Update with robin
Diffstat (limited to 'core')
-rw-r--r--core/Command/App/Disable.php2
-rw-r--r--core/Command/App/Enable.php2
-rw-r--r--core/Command/App/ListApps.php2
-rw-r--r--core/Command/Group/AddUser.php2
-rw-r--r--core/Command/Group/ListCommand.php2
-rw-r--r--core/Command/Group/RemoveUser.php2
-rw-r--r--core/Command/Maintenance/Repair.php2
-rw-r--r--core/Command/Maintenance/SingleUser.php2
-rw-r--r--core/Command/Security/ImportCertificate.php2
-rw-r--r--core/Command/Security/ListCertificates.php2
-rw-r--r--core/Command/Security/RemoveCertificate.php2
-rw-r--r--core/Command/User/Info.php2
-rw-r--r--core/Command/User/ListCommand.php2
-rw-r--r--core/Controller/AvatarController.php2
-rw-r--r--core/Controller/SetupController.php2
-rw-r--r--core/ajax/appconfig.php2
-rw-r--r--core/ajax/preview.php2
-rw-r--r--core/ajax/share.php2
-rw-r--r--core/ajax/update.php2
-rw-r--r--core/js/config.php2
-rw-r--r--core/register_command.php2
-rw-r--r--core/search/ajax/search.php2
-rw-r--r--core/strings.php2
23 files changed, 23 insertions, 23 deletions
diff --git a/core/Command/App/Disable.php b/core/Command/App/Disable.php
index 45e93a23511..07e752ee839 100644
--- a/core/Command/App/Disable.php
+++ b/core/Command/App/Disable.php
@@ -4,7 +4,7 @@
*
* @author Joas Schilling <coding@schilljs.com>
* @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin Appelman <robin@icewind.nl>
* @author Vincent Petry <pvince81@owncloud.com>
*
* @license AGPL-3.0
diff --git a/core/Command/App/Enable.php b/core/Command/App/Enable.php
index a12a169992b..d5b161f8eaf 100644
--- a/core/Command/App/Enable.php
+++ b/core/Command/App/Enable.php
@@ -4,7 +4,7 @@
*
* @author Joas Schilling <coding@schilljs.com>
* @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin Appelman <robin@icewind.nl>
* @author Vincent Petry <pvince81@owncloud.com>
*
* @license AGPL-3.0
diff --git a/core/Command/App/ListApps.php b/core/Command/App/ListApps.php
index 6359413d6e3..08449dd8dc9 100644
--- a/core/Command/App/ListApps.php
+++ b/core/Command/App/ListApps.php
@@ -4,7 +4,7 @@
*
* @author Joas Schilling <coding@schilljs.com>
* @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin Appelman <robin@icewind.nl>
* @author Victor Dubiniuk <dubiniuk@owncloud.com>
*
* @license AGPL-3.0
diff --git a/core/Command/Group/AddUser.php b/core/Command/Group/AddUser.php
index d9b90c5ccf1..05ae4e2d526 100644
--- a/core/Command/Group/AddUser.php
+++ b/core/Command/Group/AddUser.php
@@ -2,7 +2,7 @@
/**
* @copyright Copyright (c) 2016 Robin Appelman <robin@icewind.nl>
*
- * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin Appelman <robin@icewind.nl>
*
* @license GNU AGPL version 3 or any later version
*
diff --git a/core/Command/Group/ListCommand.php b/core/Command/Group/ListCommand.php
index 6dc5ced1c12..f3703bc1099 100644
--- a/core/Command/Group/ListCommand.php
+++ b/core/Command/Group/ListCommand.php
@@ -2,7 +2,7 @@
/**
* @copyright Copyright (c) 2016 Robin Appelman <robin@icewind.nl>
*
- * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin Appelman <robin@icewind.nl>
*
* @license GNU AGPL version 3 or any later version
*
diff --git a/core/Command/Group/RemoveUser.php b/core/Command/Group/RemoveUser.php
index 71c04a4f8d2..09f081004d2 100644
--- a/core/Command/Group/RemoveUser.php
+++ b/core/Command/Group/RemoveUser.php
@@ -2,7 +2,7 @@
/**
* @copyright Copyright (c) 2016 Robin Appelman <robin@icewind.nl>
*
- * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin Appelman <robin@icewind.nl>
*
* @license GNU AGPL version 3 or any later version
*
diff --git a/core/Command/Maintenance/Repair.php b/core/Command/Maintenance/Repair.php
index 514da169165..236326b4e32 100644
--- a/core/Command/Maintenance/Repair.php
+++ b/core/Command/Maintenance/Repair.php
@@ -4,7 +4,7 @@
*
* @author Joas Schilling <coding@schilljs.com>
* @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin Appelman <robin@icewind.nl>
* @author Thomas Müller <thomas.mueller@tmit.eu>
* @author Vincent Petry <pvince81@owncloud.com>
*
diff --git a/core/Command/Maintenance/SingleUser.php b/core/Command/Maintenance/SingleUser.php
index 6715da6636c..e4f945596d2 100644
--- a/core/Command/Maintenance/SingleUser.php
+++ b/core/Command/Maintenance/SingleUser.php
@@ -3,7 +3,7 @@
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin Appelman <robin@icewind.nl>
*
* @license AGPL-3.0
*
diff --git a/core/Command/Security/ImportCertificate.php b/core/Command/Security/ImportCertificate.php
index 4dc037363a9..38a774add50 100644
--- a/core/Command/Security/ImportCertificate.php
+++ b/core/Command/Security/ImportCertificate.php
@@ -2,7 +2,7 @@
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
- * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin Appelman <robin@icewind.nl>
*
* @license AGPL-3.0
*
diff --git a/core/Command/Security/ListCertificates.php b/core/Command/Security/ListCertificates.php
index 6378ffa7467..fe19348876a 100644
--- a/core/Command/Security/ListCertificates.php
+++ b/core/Command/Security/ListCertificates.php
@@ -2,7 +2,7 @@
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
- * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin Appelman <robin@icewind.nl>
*
* @license AGPL-3.0
*
diff --git a/core/Command/Security/RemoveCertificate.php b/core/Command/Security/RemoveCertificate.php
index 04d8319e4d0..8be7123ad08 100644
--- a/core/Command/Security/RemoveCertificate.php
+++ b/core/Command/Security/RemoveCertificate.php
@@ -3,7 +3,7 @@
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Carla Schroder <carla@owncloud.com>
- * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin Appelman <robin@icewind.nl>
*
* @license AGPL-3.0
*
diff --git a/core/Command/User/Info.php b/core/Command/User/Info.php
index 818b81136f2..b23ddd942a0 100644
--- a/core/Command/User/Info.php
+++ b/core/Command/User/Info.php
@@ -2,7 +2,7 @@
/**
* @copyright Copyright (c) 2016 Robin Appelman <robin@icewind.nl>
*
- * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin Appelman <robin@icewind.nl>
*
* @license GNU AGPL version 3 or any later version
*
diff --git a/core/Command/User/ListCommand.php b/core/Command/User/ListCommand.php
index 978e9371830..77d99eb2130 100644
--- a/core/Command/User/ListCommand.php
+++ b/core/Command/User/ListCommand.php
@@ -2,7 +2,7 @@
/**
* @copyright Copyright (c) 2016 Robin Appelman <robin@icewind.nl>
*
- * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin Appelman <robin@icewind.nl>
*
* @license GNU AGPL version 3 or any later version
*
diff --git a/core/Controller/AvatarController.php b/core/Controller/AvatarController.php
index 5e02140a652..ed63025aca4 100644
--- a/core/Controller/AvatarController.php
+++ b/core/Controller/AvatarController.php
@@ -5,7 +5,7 @@
* @author Joas Schilling <coding@schilljs.com>
* @author Lukas Reschke <lukas@statuscode.ch>
* @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin Appelman <robin@icewind.nl>
* @author Roeland Jago Douma <roeland@famdouma.nl>
* @author Thomas Müller <thomas.mueller@tmit.eu>
* @author Vincent Petry <pvince81@owncloud.com>
diff --git a/core/Controller/SetupController.php b/core/Controller/SetupController.php
index 6dcbc1a9783..fc1efe4c11b 100644
--- a/core/Controller/SetupController.php
+++ b/core/Controller/SetupController.php
@@ -6,7 +6,7 @@
* @author ideaship <ideaship@users.noreply.github.com>
* @author Lukas Reschke <lukas@statuscode.ch>
* @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin Appelman <robin@icewind.nl>
* @author Robin McCorkell <robin@mccorkell.me.uk>
* @author Thomas Müller <thomas.mueller@tmit.eu>
*
diff --git a/core/ajax/appconfig.php b/core/ajax/appconfig.php
index 2d63222108a..6bb70e4c393 100644
--- a/core/ajax/appconfig.php
+++ b/core/ajax/appconfig.php
@@ -4,7 +4,7 @@
*
* @author Lukas Reschke <lukas@statuscode.ch>
* @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin Appelman <robin@icewind.nl>
* @author Thomas Müller <thomas.mueller@tmit.eu>
*
* @license AGPL-3.0
diff --git a/core/ajax/preview.php b/core/ajax/preview.php
index 006b890b178..2894efdc8e3 100644
--- a/core/ajax/preview.php
+++ b/core/ajax/preview.php
@@ -6,7 +6,7 @@
* @author Joas Schilling <coding@schilljs.com>
* @author Lukas Reschke <lukas@statuscode.ch>
* @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin Appelman <robin@icewind.nl>
* @author Thomas Müller <thomas.mueller@tmit.eu>
*
* @license AGPL-3.0
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 0d91923004b..adcf31a0dfa 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -14,7 +14,7 @@
* @author Michael Gapczynski <GapczynskiM@gmail.com>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Ramiro Aparicio <rapariciog@gmail.com>
- * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin Appelman <robin@icewind.nl>
* @author Roeland Jago Douma <roeland@famdouma.nl>
* @author Thomas Müller <thomas.mueller@tmit.eu>
* @author Thomas Tanghus <thomas@tanghus.net>
diff --git a/core/ajax/update.php b/core/ajax/update.php
index c917d0dc214..fca40477d60 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -7,7 +7,7 @@
* @author Lukas Reschke <lukas@statuscode.ch>
* @author Michael Gapczynski <GapczynskiM@gmail.com>
* @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin Appelman <robin@icewind.nl>
* @author Thomas Müller <thomas.mueller@tmit.eu>
* @author Victor Dubiniuk <dubiniuk@owncloud.com>
* @author Vincent Petry <pvince81@owncloud.com>
diff --git a/core/js/config.php b/core/js/config.php
index 3ba494aef5b..e88d9c741a1 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -12,7 +12,7 @@
* @author Lukas Reschke <lukas@statuscode.ch>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Owen Winkler <a_github@midnightcircus.com>
- * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin Appelman <robin@icewind.nl>
* @author Roeland Jago Douma <roeland@famdouma.nl>
* @author Vincent Chan <plus.vincchan@gmail.com>
* @author Vincent Petry <pvince81@owncloud.com>
diff --git a/core/register_command.php b/core/register_command.php
index 0f5b60d8b9c..6f20769fa70 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -9,7 +9,7 @@
* @author Joas Schilling <coding@schilljs.com>
* @author Lukas Reschke <lukas@statuscode.ch>
* @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin Appelman <robin@icewind.nl>
* @author Robin McCorkell <robin@mccorkell.me.uk>
* @author Roeland Jago Douma <roeland@famdouma.nl>
* @author Thomas Müller <thomas.mueller@tmit.eu>
diff --git a/core/search/ajax/search.php b/core/search/ajax/search.php
index 9e8e4367d2f..1de53158ada 100644
--- a/core/search/ajax/search.php
+++ b/core/search/ajax/search.php
@@ -6,7 +6,7 @@
* @author Jörn Friedrich Dreyer <jfd@butonic.de>
* @author Lukas Reschke <lukas@statuscode.ch>
* @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin Appelman <robin@icewind.nl>
* @author Thomas Müller <thomas.mueller@tmit.eu>
*
* @license AGPL-3.0
diff --git a/core/strings.php b/core/strings.php
index 2c074a34529..48592e9d169 100644
--- a/core/strings.php
+++ b/core/strings.php
@@ -3,7 +3,7 @@
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Jan-Christoph Borchardt <hey@jancborchardt.net>
- * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin Appelman <robin@icewind.nl>
* @author Stefan Weil <sw@weilnetz.de>
*
* @license AGPL-3.0