diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-05-26 22:54:49 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-05-26 22:54:49 +0200 |
| commit | 94c633b6b776d6da9a8b2c2e00aca0f32cfbfb92 (patch) | |
| tree | 2c5b802fea37a2803692e5c545865cdd3114f195 /core | |
| parent | 79bf933319d4e62c3ba75e7f4eb6235d8ae60e4b (diff) | |
| parent | 143287738ad9415b910240563de71cc7dbd6f2da (diff) | |
| download | nextcloud-server-94c633b6b776d6da9a8b2c2e00aca0f32cfbfb92.tar.gz nextcloud-server-94c633b6b776d6da9a8b2c2e00aca0f32cfbfb92.zip | |
Merge branch 'master' into oc_error
Diffstat (limited to 'core')
| -rw-r--r-- | core/lostpassword/index.php | 2 | ||||
| -rw-r--r-- | core/lostpassword/resetpassword.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php index 2b87a1eb111..6a4748588fc 100644 --- a/core/lostpassword/index.php +++ b/core/lostpassword/index.php @@ -1,6 +1,6 @@ <?php /** - * Copyright (c) 2010 Frank Karlitschek karlitschek@kde.org + * Copyright (c) 2012 Frank Karlitschek frank@owncloud.org * This file is licensed under the Affero General Public License version 3 or * later. * See the COPYING-README file. diff --git a/core/lostpassword/resetpassword.php b/core/lostpassword/resetpassword.php index 1c78d720947..33be9d7053b 100644 --- a/core/lostpassword/resetpassword.php +++ b/core/lostpassword/resetpassword.php @@ -1,6 +1,6 @@ <?php /** - * Copyright (c) 2010 Frank Karlitschek karlitschek@kde.org + * Copyright (c) 2012 Frank Karlitschek frank@owncloud.org * This file is licensed under the Affero General Public License version 3 or * later. * See the COPYING-README file. |