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 /lib/private/Archive | |
| 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 'lib/private/Archive')
| -rw-r--r-- | lib/private/Archive/Archive.php | 5 | ||||
| -rw-r--r-- | lib/private/Archive/TAR.php | 2 | ||||
| -rw-r--r-- | lib/private/Archive/ZIP.php | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/lib/private/Archive/Archive.php b/lib/private/Archive/Archive.php index b5286968a2f..f0b2a36407f 100644 --- a/lib/private/Archive/Archive.php +++ b/lib/private/Archive/Archive.php @@ -1,14 +1,15 @@ <?php /** - * @author Arthur Schiwon <blizzz@owncloud.com> + * @author Arthur Schiwon <blizzz@arthur-schiwon.de> * @author Bart Visscher <bartv@thisnet.nl> * @author Christopher Schäpers <kondou@ts.unde.re> * @author Felix Moeller <mail@felixmoeller.de> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> - * @author Lukas Reschke <lukas@owncloud.com> + * @author Lukas Reschke <lukas@statuscode.ch> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. diff --git a/lib/private/Archive/TAR.php b/lib/private/Archive/TAR.php index d783e53d40c..7dcc2edbbcf 100644 --- a/lib/private/Archive/TAR.php +++ b/lib/private/Archive/TAR.php @@ -4,13 +4,13 @@ * @author Christian Weiske <cweiske@cweiske.de> * @author Christopher Schäpers <kondou@ts.unde.re> * @author Felix Moeller <mail@felixmoeller.de> - * @author Frank Karlitschek <frank@owncloud.org> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> * @author Remco Brenninkmeijer <requist1@starmail.nl> * @author Robin Appelman <icewind@owncloud.com> * @author Robin McCorkell <robin@mccorkell.me.uk> + * @author Roeland Jago Douma <rullzer@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. diff --git a/lib/private/Archive/ZIP.php b/lib/private/Archive/ZIP.php index 2bc17507d32..a4b2cab2e6c 100644 --- a/lib/private/Archive/ZIP.php +++ b/lib/private/Archive/ZIP.php @@ -3,11 +3,12 @@ * @author Bart Visscher <bartv@thisnet.nl> * @author Christopher Schäpers <kondou@ts.unde.re> * @author Felix Moeller <mail@felixmoeller.de> - * @author Frank Karlitschek <frank@owncloud.org> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Jörn Friedrich Dreyer <jfd@butonic.de> * @author Morris Jobke <hey@morrisjobke.de> * @author Robin Appelman <icewind@owncloud.com> + * @author Roeland Jago Douma <rullzer@owncloud.com> + * @author Stefan Weil <sw@weilnetz.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. |