diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-04 20:46:32 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-04 20:46:32 +0200 |
| commit | e43e8b0db8d1c9935ac49d37255e934e310798c7 (patch) | |
| tree | d228f608b83e1c04ef5b97b0fe4b0a15282343b7 /apps/files/appinfo | |
| parent | 5539b9e843dbd4125ba9bbb3de79d47ef48e059b (diff) | |
| parent | 09187f3b3b30e6f810c6afff7332615ed472154e (diff) | |
| download | nextcloud-server-e43e8b0db8d1c9935ac49d37255e934e310798c7.tar.gz nextcloud-server-e43e8b0db8d1c9935ac49d37255e934e310798c7.zip | |
Merge branch 'master' into rename-lostpassword-controller
Conflicts:
core/lostpassword/controller.php
Diffstat (limited to 'apps/files/appinfo')
0 files changed, 0 insertions, 0 deletions