diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-07 10:44:28 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-07 10:44:28 +0100 |
| commit | 5788d36c8d1e9869d8a645293805e3b0265ea238 (patch) | |
| tree | 80045c0eb1687652f956b3bdaccb1c765893d2e1 /apps/files/l10n/ja_JP.php | |
| parent | 84f3c8b6cc1060203d807ee65545478ce34f93c4 (diff) | |
| parent | 35bd7a400d30fb27703d4fa02b107f9629845b7d (diff) | |
| download | nextcloud-server-5788d36c8d1e9869d8a645293805e3b0265ea238.tar.gz nextcloud-server-5788d36c8d1e9869d8a645293805e3b0265ea238.zip | |
Merge branch 'master' into fixing-1354-master
Conflicts:
settings/admin.php
settings/templates/admin.php
Diffstat (limited to 'apps/files/l10n/ja_JP.php')
0 files changed, 0 insertions, 0 deletions