summaryrefslogtreecommitdiffstats
path: root/lib/private/Files/View.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/Files/View.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/Files/View.php')
-rw-r--r--lib/private/Files/View.php9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
index 27613903086..f738542ea8c 100644
--- a/lib/private/Files/View.php
+++ b/lib/private/Files/View.php
@@ -1,23 +1,26 @@
<?php
/**
- * @author Arthur Schiwon <blizzz@owncloud.com>
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
* @author Bart Visscher <bartv@thisnet.nl>
- * @author Björn Schießle <schiessle@owncloud.com>
+ * @author Björn Schießle <bjoern@schiessle.org>
* @author cmeh <cmeh@users.noreply.github.com>
* @author Florin Peter <github@florin-peter.de>
* @author Jesús Macias <jmacias@solidgear.es>
* @author Joas Schilling <nickvergessen@owncloud.com>
* @author Jörn Friedrich Dreyer <jfd@butonic.de>
* @author Klaas Freitag <freitag@owncloud.com>
- * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Lukas Reschke <lukas@statuscode.ch>
* @author Luke Policinski <lpolicinski@gmail.com>
* @author Martin Mattel <martin.mattel@diemattels.at>
* @author Michael Gapczynski <GapczynskiM@gmail.com>
* @author Morris Jobke <hey@morrisjobke.de>
+ * @author Petr Svoboda <weits666@gmail.com>
+ * @author Piotr Filiciak <piotr@filiciak.pl>
* @author Robin Appelman <icewind@owncloud.com>
* @author Robin McCorkell <robin@mccorkell.me.uk>
* @author Roeland Jago Douma <rullzer@owncloud.com>
* @author Sam Tuke <mail@samtuke.com>
+ * @author Stefan Weil <sw@weilnetz.de>
* @author Thomas Müller <thomas.mueller@tmit.eu>
* @author Thomas Tanghus <thomas@tanghus.net>
* @author Vincent Petry <pvince81@owncloud.com>