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/Share20 | |
| 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/Share20')
| -rw-r--r-- | lib/private/Share20/DefaultShareProvider.php | 1 | ||||
| -rw-r--r-- | lib/private/Share20/Manager.php | 3 | ||||
| -rw-r--r-- | lib/private/Share20/ProviderFactory.php | 3 | ||||
| -rw-r--r-- | lib/private/Share20/Share.php | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php index 8a39c18a495..aa8f1729a9d 100644 --- a/lib/private/Share20/DefaultShareProvider.php +++ b/lib/private/Share20/DefaultShareProvider.php @@ -1,5 +1,6 @@ <?php /** + * @author Björn Schießle <bjoern@schiessle.org> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Roeland Jago Douma <rullzer@owncloud.com> * diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index 3568995472a..ceaaa58cf6e 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -1,6 +1,7 @@ <?php /** - * @author Arthur Schiwon <blizzz@owncloud.com> + * @author Arthur Schiwon <blizzz@arthur-schiwon.de> + * @author Björn Schießle <bjoern@schiessle.org> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Roeland Jago Douma <rullzer@owncloud.com> * diff --git a/lib/private/Share20/ProviderFactory.php b/lib/private/Share20/ProviderFactory.php index b436a7bc5f3..78d2cbf7e4c 100644 --- a/lib/private/Share20/ProviderFactory.php +++ b/lib/private/Share20/ProviderFactory.php @@ -1,6 +1,7 @@ <?php /** - * @author Lukas Reschke <lukas@owncloud.com> + * @author Björn Schießle <bjoern@schiessle.org> + * @author Lukas Reschke <lukas@statuscode.ch> * @author Roeland Jago Douma <rullzer@owncloud.com> * * @copyright Copyright (c) 2016, ownCloud, Inc. diff --git a/lib/private/Share20/Share.php b/lib/private/Share20/Share.php index f56fd94b409..87001146796 100644 --- a/lib/private/Share20/Share.php +++ b/lib/private/Share20/Share.php @@ -1,5 +1,6 @@ <?php /** + * @author Björn Schießle <bjoern@schiessle.org> * @author Roeland Jago Douma <rullzer@owncloud.com> * * @copyright Copyright (c) 2016, ownCloud, Inc. |