diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2016-05-26 20:08:40 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2016-05-26 20:08:40 +0200 |
| commit | 2832e4f226390e212d0bdfb6581a3f37fe4faa3c (patch) | |
| tree | 2ae8672eb796343a3fad86a011fbce64a0afc0e8 /apps/dav/lib/CardDAV/CardDavBackend.php | |
| parent | 4b1e8a1184125aabd7cbe0d0e4ef7ee7fda7223f (diff) | |
| parent | aba539703c0b0388f5ebf8757067bafab56774ce (diff) | |
| download | nextcloud-server-2832e4f226390e212d0bdfb6581a3f37fe4faa3c.tar.gz nextcloud-server-2832e4f226390e212d0bdfb6581a3f37fe4faa3c.zip | |
Merge pull request #24796 from owncloud/fix-mailmap
Adjust mail entries
Diffstat (limited to 'apps/dav/lib/CardDAV/CardDavBackend.php')
| -rw-r--r-- | apps/dav/lib/CardDAV/CardDavBackend.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php index 28d5ed1ae99..3d2904df39c 100644 --- a/apps/dav/lib/CardDAV/CardDavBackend.php +++ b/apps/dav/lib/CardDAV/CardDavBackend.php @@ -1,8 +1,9 @@ <?php /** - * @author Arthur Schiwon <blizzz@owncloud.com> - * @author Björn Schießle <schiessle@owncloud.com> + * @author Arthur Schiwon <blizzz@arthur-schiwon.de> + * @author Björn Schießle <bjoern@schiessle.org> * @author Joas Schilling <nickvergessen@owncloud.com> + * @author Stefan Weil <sw@weilnetz.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. |