diff options
author | C. Montero Luque <cmonteroluque@users.noreply.github.com> | 2016-03-01 15:36:37 -0500 |
---|---|---|
committer | C. Montero Luque <cmonteroluque@users.noreply.github.com> | 2016-03-01 15:36:37 -0500 |
commit | 4d69e562a065a79461343444a842ada025f3643c (patch) | |
tree | 557995f07f3cc7d00376cc43a148dca2bcea3a3e /apps/encryption | |
parent | 12479a1eda63e45207290eeaa68498112c40a9bf (diff) | |
parent | 3067367ff35757e03d4db11e13e7d2bcd6b08610 (diff) | |
download | nextcloud-server-4d69e562a065a79461343444a842ada025f3643c.tar.gz nextcloud-server-4d69e562a065a79461343444a842ada025f3643c.zip |
Merge pull request #22757 from owncloud/apply-license
Update copyright information and author file
Diffstat (limited to 'apps/encryption')
-rw-r--r-- | apps/encryption/hooks/userhooks.php | 1 | ||||
-rw-r--r-- | apps/encryption/lib/crypto/crypt.php | 1 | ||||
-rw-r--r-- | apps/encryption/lib/crypto/encryption.php | 1 | ||||
-rw-r--r-- | apps/encryption/lib/keymanager.php | 2 | ||||
-rw-r--r-- | apps/encryption/lib/migration.php | 1 | ||||
-rw-r--r-- | apps/encryption/lib/recovery.php | 1 | ||||
-rw-r--r-- | apps/encryption/tests/lib/KeyManagerTest.php | 1 | ||||
-rw-r--r-- | apps/encryption/tests/lib/MigrationTest.php | 1 | ||||
-rw-r--r-- | apps/encryption/tests/lib/crypto/cryptTest.php | 1 |
9 files changed, 3 insertions, 7 deletions
diff --git a/apps/encryption/hooks/userhooks.php b/apps/encryption/hooks/userhooks.php index 3f84187bc1e..62acd168909 100644 --- a/apps/encryption/hooks/userhooks.php +++ b/apps/encryption/hooks/userhooks.php @@ -2,7 +2,6 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * @author Clark Tomlinson <fallen013@gmail.com> - * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. diff --git a/apps/encryption/lib/crypto/crypt.php b/apps/encryption/lib/crypto/crypt.php index b4c10f42790..645f1ff0547 100644 --- a/apps/encryption/lib/crypto/crypt.php +++ b/apps/encryption/lib/crypto/crypt.php @@ -4,7 +4,6 @@ * @author Clark Tomlinson <fallen013@gmail.com> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> - * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php index 620bdd6ca9a..10c8c4a290a 100644 --- a/apps/encryption/lib/crypto/encryption.php +++ b/apps/encryption/lib/crypto/encryption.php @@ -5,7 +5,6 @@ * @author Jan-Christoph Borchardt <hey@jancborchardt.net> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Lukas Reschke <lukas@owncloud.com> - * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. diff --git a/apps/encryption/lib/keymanager.php b/apps/encryption/lib/keymanager.php index 4169569d8b2..12fa5f92bd5 100644 --- a/apps/encryption/lib/keymanager.php +++ b/apps/encryption/lib/keymanager.php @@ -3,8 +3,8 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Clark Tomlinson <fallen013@gmail.com> * @author Lukas Reschke <lukas@owncloud.com> - * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * @author Thomas Müller <thomas.mueller@tmit.eu> + * @author Vincent Petry <pvince81@owncloud.com> * * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/encryption/lib/migration.php b/apps/encryption/lib/migration.php index 1b79ddfe7f1..db9541d6f5a 100644 --- a/apps/encryption/lib/migration.php +++ b/apps/encryption/lib/migration.php @@ -3,7 +3,6 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Joas Schilling <nickvergessen@owncloud.com> * @author Robin Appelman <icewind@owncloud.com> - * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/encryption/lib/recovery.php b/apps/encryption/lib/recovery.php index 8833ea8f0ed..f0ac7bb2383 100644 --- a/apps/encryption/lib/recovery.php +++ b/apps/encryption/lib/recovery.php @@ -3,7 +3,6 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Clark Tomlinson <fallen013@gmail.com> * @author Lukas Reschke <lukas@owncloud.com> - * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/encryption/tests/lib/KeyManagerTest.php b/apps/encryption/tests/lib/KeyManagerTest.php index ea1830db4d5..7ede6177deb 100644 --- a/apps/encryption/tests/lib/KeyManagerTest.php +++ b/apps/encryption/tests/lib/KeyManagerTest.php @@ -3,6 +3,7 @@ * @author Björn Schießle <schiessle@owncloud.com> * @author Clark Tomlinson <fallen013@gmail.com> * @author Joas Schilling <nickvergessen@owncloud.com> + * @author Lukas Reschke <lukas@owncloud.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * * @copyright Copyright (c) 2016, ownCloud, Inc. diff --git a/apps/encryption/tests/lib/MigrationTest.php b/apps/encryption/tests/lib/MigrationTest.php index f00704e42e8..6edb8624e70 100644 --- a/apps/encryption/tests/lib/MigrationTest.php +++ b/apps/encryption/tests/lib/MigrationTest.php @@ -4,7 +4,6 @@ * @author Joas Schilling <nickvergessen@owncloud.com> * @author Robin Appelman <icewind@owncloud.com> * @author Roeland Jago Douma <rullzer@owncloud.com> - * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> * * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 diff --git a/apps/encryption/tests/lib/crypto/cryptTest.php b/apps/encryption/tests/lib/crypto/cryptTest.php index d94aea463cf..2f290db21a1 100644 --- a/apps/encryption/tests/lib/crypto/cryptTest.php +++ b/apps/encryption/tests/lib/crypto/cryptTest.php @@ -2,6 +2,7 @@ /** * @author Björn Schießle <schiessle@owncloud.com> * @author Joas Schilling <nickvergessen@owncloud.com> + * @author Lukas Reschke <lukas@owncloud.com> * * @copyright Copyright (c) 2016, ownCloud, Inc. * @license AGPL-3.0 |