summaryrefslogtreecommitdiffstats
path: root/lib/private/Comments/Comment.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/Comments/Comment.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/Comments/Comment.php')
-rw-r--r--lib/private/Comments/Comment.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/Comments/Comment.php b/lib/private/Comments/Comment.php
index 60663d61578..4a301e4047e 100644
--- a/lib/private/Comments/Comment.php
+++ b/lib/private/Comments/Comment.php
@@ -1,6 +1,7 @@
<?php
/**
- * @author Arthur Schiwon <blizzz@owncloud.com>
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
* @author Thomas Müller <thomas.mueller@tmit.eu>
*
* @copyright Copyright (c) 2016, ownCloud, Inc.