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/public/Encryption | |
| 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/public/Encryption')
| -rw-r--r-- | lib/public/Encryption/Exceptions/GenericEncryptionException.php | 4 | ||||
| -rw-r--r-- | lib/public/Encryption/IEncryptionModule.php | 5 | ||||
| -rw-r--r-- | lib/public/Encryption/IFile.php | 2 | ||||
| -rw-r--r-- | lib/public/Encryption/IManager.php | 2 | ||||
| -rw-r--r-- | lib/public/Encryption/Keys/IStorage.php | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/lib/public/Encryption/Exceptions/GenericEncryptionException.php b/lib/public/Encryption/Exceptions/GenericEncryptionException.php index c1331689c7f..3822a0ba7d3 100644 --- a/lib/public/Encryption/Exceptions/GenericEncryptionException.php +++ b/lib/public/Encryption/Exceptions/GenericEncryptionException.php @@ -1,8 +1,8 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> + * @author Björn Schießle <bjoern@schiessle.org> * @author Clark Tomlinson <fallen013@gmail.com> - * @author Lukas Reschke <lukas@owncloud.com> + * @author Lukas Reschke <lukas@statuscode.ch> * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * diff --git a/lib/public/Encryption/IEncryptionModule.php b/lib/public/Encryption/IEncryptionModule.php index 8d20a1ab57d..57a1baa0c1c 100644 --- a/lib/public/Encryption/IEncryptionModule.php +++ b/lib/public/Encryption/IEncryptionModule.php @@ -1,8 +1,9 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> - * @author Lukas Reschke <lukas@owncloud.com> + * @author Björn Schießle <bjoern@schiessle.org> + * @author Lukas Reschke <lukas@statuscode.ch> * @author Morris Jobke <hey@morrisjobke.de> + * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 diff --git a/lib/public/Encryption/IFile.php b/lib/public/Encryption/IFile.php index 9933cb0164e..dd1d8161f69 100644 --- a/lib/public/Encryption/IFile.php +++ b/lib/public/Encryption/IFile.php @@ -1,6 +1,6 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> + * @author Björn Schießle <bjoern@schiessle.org> * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> * diff --git a/lib/public/Encryption/IManager.php b/lib/public/Encryption/IManager.php index b07de0cbb4f..a6eb06a34eb 100644 --- a/lib/public/Encryption/IManager.php +++ b/lib/public/Encryption/IManager.php @@ -1,6 +1,6 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> + * @author Björn Schießle <bjoern@schiessle.org> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * diff --git a/lib/public/Encryption/Keys/IStorage.php b/lib/public/Encryption/Keys/IStorage.php index cfac4ba58f7..9c2322a1dd7 100644 --- a/lib/public/Encryption/Keys/IStorage.php +++ b/lib/public/Encryption/Keys/IStorage.php @@ -1,6 +1,6 @@ <?php /** - * @author Björn Schießle <schiessle@owncloud.com> + * @author Björn Schießle <bjoern@schiessle.org> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Morris Jobke <hey@morrisjobke.de> * @author Thomas Müller <thomas.mueller@tmit.eu> |