summaryrefslogtreecommitdiffstats
path: root/apps/encryption/controller
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-06-25 11:43:55 +0200
committerMorris Jobke <hey@morrisjobke.de>2015-06-25 14:13:49 +0200
commitf63915d0c8b28ed507f0db6e11ef50e9a0bd39f4 (patch)
tree411739523aed92226927f7aa5d90e69656af693e /apps/encryption/controller
parentcdb0e62e9b7a537f79f8674bc641fb88ec30c2be (diff)
downloadnextcloud-server-f63915d0c8b28ed507f0db6e11ef50e9a0bd39f4.tar.gz
nextcloud-server-f63915d0c8b28ed507f0db6e11ef50e9a0bd39f4.zip
update license headers and authors
Diffstat (limited to 'apps/encryption/controller')
-rw-r--r--apps/encryption/controller/recoverycontroller.php2
-rw-r--r--apps/encryption/controller/settingscontroller.php2
-rw-r--r--apps/encryption/controller/statuscontroller.php2
3 files changed, 6 insertions, 0 deletions
diff --git a/apps/encryption/controller/recoverycontroller.php b/apps/encryption/controller/recoverycontroller.php
index f1a2651443e..a92c49f539f 100644
--- a/apps/encryption/controller/recoverycontroller.php
+++ b/apps/encryption/controller/recoverycontroller.php
@@ -3,6 +3,8 @@
* @author Björn Schießle <schiessle@owncloud.com>
* @author Clark Tomlinson <fallen013@gmail.com>
* @author Lukas Reschke <lukas@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
diff --git a/apps/encryption/controller/settingscontroller.php b/apps/encryption/controller/settingscontroller.php
index 7fa3f469a14..641c97e1d6e 100644
--- a/apps/encryption/controller/settingscontroller.php
+++ b/apps/encryption/controller/settingscontroller.php
@@ -1,6 +1,8 @@
<?php
/**
* @author Björn Schießle <schiessle@owncloud.com>
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
diff --git a/apps/encryption/controller/statuscontroller.php b/apps/encryption/controller/statuscontroller.php
index cdc4b2e92e0..f330f726c0b 100644
--- a/apps/encryption/controller/statuscontroller.php
+++ b/apps/encryption/controller/statuscontroller.php
@@ -1,6 +1,8 @@
<?php
/**
* @author Björn Schießle <schiessle@owncloud.com>
+ * @author Morris Jobke <hey@morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller@tmit.eu>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0