summaryrefslogtreecommitdiffstats
path: root/lib/private/OCS/PrivateData.php
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2016-05-26 20:08:40 +0200
committerLukas Reschke <lukas@statuscode.ch>2016-05-26 20:08:40 +0200
commit2832e4f226390e212d0bdfb6581a3f37fe4faa3c (patch)
tree2ae8672eb796343a3fad86a011fbce64a0afc0e8 /lib/private/OCS/PrivateData.php
parent4b1e8a1184125aabd7cbe0d0e4ef7ee7fda7223f (diff)
parentaba539703c0b0388f5ebf8757067bafab56774ce (diff)
downloadnextcloud-server-2832e4f226390e212d0bdfb6581a3f37fe4faa3c.tar.gz
nextcloud-server-2832e4f226390e212d0bdfb6581a3f37fe4faa3c.zip
Merge pull request #24796 from owncloud/fix-mailmap
Adjust mail entries
Diffstat (limited to 'lib/private/OCS/PrivateData.php')
-rw-r--r--lib/private/OCS/PrivateData.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/OCS/PrivateData.php b/lib/private/OCS/PrivateData.php
index c69d8b9cc17..46c84175e3e 100644
--- a/lib/private/OCS/PrivateData.php
+++ b/lib/private/OCS/PrivateData.php
@@ -2,9 +2,10 @@
/**
* @author Andreas Fischer <bantu@owncloud.com>
* @author Bart Visscher <bartv@thisnet.nl>
- * @author Frank Karlitschek <frank@owncloud.org>
- * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Frank Karlitschek <frank@karlitschek.de>
+ * @author Lukas Reschke <lukas@statuscode.ch>
* @author Morris Jobke <hey@morrisjobke.de>
+ * @author Roeland Jago Douma <rullzer@owncloud.com>
* @author Thomas Müller <thomas.mueller@tmit.eu>
* @author Tom Needham <tom@owncloud.com>
*