diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-05-19 20:40:55 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-05-19 20:40:55 +0200 |
| commit | f8cb8f480346fb36ca18258b902a7157265c8ac7 (patch) | |
| tree | 6445753bb12ad5d050d6397364ddd61c035ad0e8 /apps/files/l10n/am_ET.php | |
| parent | e1e1009ccc304f6e527c3cc392b510f6d8868533 (diff) | |
| parent | b6d2d6329d99c47fa8a01a7a8db7f8f2de6b9f74 (diff) | |
| download | nextcloud-server-f8cb8f480346fb36ca18258b902a7157265c8ac7.tar.gz nextcloud-server-f8cb8f480346fb36ca18258b902a7157265c8ac7.zip | |
Merge branch 'master' into csrf-on-login-and-logout
Conflicts:
core/templates/login.php
Diffstat (limited to 'apps/files/l10n/am_ET.php')
0 files changed, 0 insertions, 0 deletions