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 /status.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 'status.php')
| -rw-r--r-- | status.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/status.php b/status.php index 4afabbf2cd1..0f2be4d56fa 100644 --- a/status.php +++ b/status.php @@ -2,9 +2,10 @@ /** * @author Andreas Fischer <bantu@owncloud.com> * @author Christopher Schäpers <kondou@ts.unde.re> - * @author Frank Karlitschek <frank@owncloud.org> + * @author Frank Karlitschek <frank@karlitschek.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 Masaki Kawabata Neto <masaki.kawabata@gmail.com> * @author Morris Jobke <hey@morrisjobke.de> * |