summaryrefslogtreecommitdiffstats
path: root/apps/encryption
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2016-07-21 18:13:36 +0200
committerJoas Schilling <coding@schilljs.com>2016-07-21 18:13:58 +0200
commit0215b004da6af887b3e3efa28c425d41a1c76b9b (patch)
tree85eb9718f671a8c705627d206b605d847960dd09 /apps/encryption
parentba87db3fccb40aa58d84d12932424c83a4db411f (diff)
downloadnextcloud-server-0215b004da6af887b3e3efa28c425d41a1c76b9b.tar.gz
nextcloud-server-0215b004da6af887b3e3efa28c425d41a1c76b9b.zip
Update with robin
Diffstat (limited to 'apps/encryption')
-rw-r--r--apps/encryption/lib/Migration.php2
-rw-r--r--apps/encryption/tests/MigrationTest.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/encryption/lib/Migration.php b/apps/encryption/lib/Migration.php
index cbf967e000d..7f4acbb68d4 100644
--- a/apps/encryption/lib/Migration.php
+++ b/apps/encryption/lib/Migration.php
@@ -4,7 +4,7 @@
*
* @author Björn Schießle <bjoern@schiessle.org>
* @author Joas Schilling <coding@schilljs.com>
- * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin Appelman <robin@icewind.nl>
*
* @license AGPL-3.0
*
diff --git a/apps/encryption/tests/MigrationTest.php b/apps/encryption/tests/MigrationTest.php
index 06b6988e403..3126dd2ff2c 100644
--- a/apps/encryption/tests/MigrationTest.php
+++ b/apps/encryption/tests/MigrationTest.php
@@ -4,7 +4,7 @@
*
* @author Björn Schießle <bjoern@schiessle.org>
* @author Joas Schilling <coding@schilljs.com>
- * @author Robin Appelman <icewind@owncloud.com>
+ * @author Robin Appelman <robin@icewind.nl>
* @author Roeland Jago Douma <roeland@famdouma.nl>
*
* @license AGPL-3.0