summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-11-06 21:04:40 +0100
committerGitHub <noreply@github.com>2017-11-06 21:04:40 +0100
commitebe75fb4baaaa3201ad8e08e26094ebcaf4debb0 (patch)
treeb216b370a84864d2289054cb39329bbf2bf5cd18 /core
parent271a2692bd0f35874c4f35935c7d099279269cb6 (diff)
parent31c5c2a59277fa2f597836097601da50ee1430ea (diff)
downloadnextcloud-server-ebe75fb4baaaa3201ad8e08e26094ebcaf4debb0.tar.gz
nextcloud-server-ebe75fb4baaaa3201ad8e08e26094ebcaf4debb0.zip
Merge pull request #7087 from nextcloud/change-email-of-georg
Change georgehrke's email
Diffstat (limited to 'core')
-rw-r--r--core/Controller/ContactsMenuController.php2
-rw-r--r--core/Migrations/Version13000Date20170919121250.php1
-rw-r--r--core/Migrations/Version13000Date20170926101637.php1
-rw-r--r--core/routes.php2
4 files changed, 4 insertions, 2 deletions
diff --git a/core/Controller/ContactsMenuController.php b/core/Controller/ContactsMenuController.php
index 32984e5d9bc..db6383cb2ac 100644
--- a/core/Controller/ContactsMenuController.php
+++ b/core/Controller/ContactsMenuController.php
@@ -3,7 +3,7 @@
* @copyright 2017 Christoph Wurst <christoph@winzerhof-wurst.at>
*
* @author Christoph Wurst <christoph@owncloud.com>
- * @author Georg Ehrke <georg@owncloud.com>
+ * @author Georg Ehrke <oc.list@georgehrke.com>
* @author Roeland Jago Douma <roeland@famdouma.nl>
*
* @license GNU AGPL version 3 or any later version
diff --git a/core/Migrations/Version13000Date20170919121250.php b/core/Migrations/Version13000Date20170919121250.php
index d27d1df6462..0857d6d5ceb 100644
--- a/core/Migrations/Version13000Date20170919121250.php
+++ b/core/Migrations/Version13000Date20170919121250.php
@@ -3,6 +3,7 @@
*
*
* @author Joas Schilling <coding@schilljs.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
*
* @license GNU AGPL version 3 or any later version
*
diff --git a/core/Migrations/Version13000Date20170926101637.php b/core/Migrations/Version13000Date20170926101637.php
index 7c4e0d48997..f51828e7a33 100644
--- a/core/Migrations/Version13000Date20170926101637.php
+++ b/core/Migrations/Version13000Date20170926101637.php
@@ -3,6 +3,7 @@
*
*
* @author Joas Schilling <coding@schilljs.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
*
* @license GNU AGPL version 3 or any later version
*
diff --git a/core/routes.php b/core/routes.php
index 93dc126d210..1cb44e47d9d 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -6,7 +6,7 @@
* @author Bernhard Posselt <dev@bernhard-posselt.com>
* @author Christoph Wurst <christoph@owncloud.com>
* @author Christopher Schäpers <kondou@ts.unde.re>
- * @author Georg Ehrke <georg@owncloud.com>
+ * @author Georg Ehrke <oc.list@georgehrke.com>
* @author Joas Schilling <coding@schilljs.com>
* @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* @author Lukas Reschke <lukas@statuscode.ch>