summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-10-26 17:14:06 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-10-26 17:14:06 +0100
commit23e51c37cf56bcfee0496ef7b7be123426661cff (patch)
treee5aa2f77f0339399cbf8686bc67b7921c7cbbb7b /core
parentcbd31e4fa9e7d4e469f2f3fc955e9b8e76f8628e (diff)
parent76b8371a471d0c2178cdeec45f8cee049774b44e (diff)
downloadnextcloud-server-23e51c37cf56bcfee0496ef7b7be123426661cff.tar.gz
nextcloud-server-23e51c37cf56bcfee0496ef7b7be123426661cff.zip
Merge pull request #20049 from owncloud/make-author-file-complete
Generate author file by license.php build script
Diffstat (limited to 'core')
-rw-r--r--core/ajax/share.php2
-rw-r--r--core/ajax/update.php1
-rw-r--r--core/application.php2
-rw-r--r--core/avatar/avatarcontroller.php3
-rw-r--r--core/command/maintenance/mimetype/updatejs.php2
-rw-r--r--core/js/config.php2
-rw-r--r--core/routes.php2
7 files changed, 8 insertions, 6 deletions
diff --git a/core/ajax/share.php b/core/ajax/share.php
index a1c573900c9..68afd7b4e84 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -13,7 +13,7 @@
* @author Morris Jobke <hey@morrisjobke.de>
* @author Ramiro Aparicio <rapariciog@gmail.com>
* @author Robin Appelman <icewind@owncloud.com>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @author Roeland Jago Douma <rullzer@owncloud.com>
* @author Thomas Müller <thomas.mueller@tmit.eu>
* @author Thomas Tanghus <thomas@tanghus.net>
* @author Vincent Petry <pvince81@owncloud.com>
diff --git a/core/ajax/update.php b/core/ajax/update.php
index 42f7f14bbdd..d6dfa071090 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -1,6 +1,7 @@
<?php
/**
* @author Bart Visscher <bartv@thisnet.nl>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
* @author Lukas Reschke <lukas@owncloud.com>
* @author Michael Gapczynski <GapczynskiM@gmail.com>
* @author Morris Jobke <hey@morrisjobke.de>
diff --git a/core/application.php b/core/application.php
index eab2c686dc1..dfc4fc38c7d 100644
--- a/core/application.php
+++ b/core/application.php
@@ -3,7 +3,7 @@
* @author Bernhard Posselt <dev@bernhard-posselt.com>
* @author Lukas Reschke <lukas@owncloud.com>
* @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @author Roeland Jago Douma <rullzer@owncloud.com>
* @author Thomas Müller <thomas.mueller@tmit.eu>
* @author Victor Dubiniuk <dubiniuk@owncloud.com>
*
diff --git a/core/avatar/avatarcontroller.php b/core/avatar/avatarcontroller.php
index e15b47e9a84..6c0321e6b5e 100644
--- a/core/avatar/avatarcontroller.php
+++ b/core/avatar/avatarcontroller.php
@@ -4,8 +4,9 @@
* @author Lukas Reschke <lukas@owncloud.com>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Robin Appelman <icewind@owncloud.com>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @author Roeland Jago Douma <rullzer@owncloud.com>
* @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Vincent Petry <pvince81@owncloud.com>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
diff --git a/core/command/maintenance/mimetype/updatejs.php b/core/command/maintenance/mimetype/updatejs.php
index 5329475c0a6..b2c57556cb4 100644
--- a/core/command/maintenance/mimetype/updatejs.php
+++ b/core/command/maintenance/mimetype/updatejs.php
@@ -1,7 +1,7 @@
<?php
/**
* @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @author Roeland Jago Douma <rullzer@owncloud.com>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
diff --git a/core/js/config.php b/core/js/config.php
index e2d7ae3784c..953bd2ede45 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -11,7 +11,7 @@
* @author Morris Jobke <hey@morrisjobke.de>
* @author Owen Winkler <a_github@midnightcircus.com>
* @author Robin Appelman <icewind@owncloud.com>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @author Roeland Jago Douma <rullzer@owncloud.com>
* @author Thomas Müller <thomas.mueller@tmit.eu>
* @author Vincent Petry <pvince81@owncloud.com>
*
diff --git a/core/routes.php b/core/routes.php
index 57fa606f5fb..0eb013aae85 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -6,7 +6,7 @@
* @author Georg Ehrke <georg@owncloud.com>
* @author Lukas Reschke <lukas@owncloud.com>
* @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @author Roeland Jago Douma <rullzer@owncloud.com>
* @author Thomas Müller <thomas.mueller@tmit.eu>
* @author Thomas Tanghus <thomas@tanghus.net>
* @author Victor Dubiniuk <dubiniuk@owncloud.com>