diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-06 22:46:40 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-06 22:46:40 +0100 |
| commit | 9671ace32e57ce6b176a50dc346baf3b3b7eb14e (patch) | |
| tree | bf3b4afd8de851d108909fc5a9ad198c13d93c8a /apps/files_versions/l10n/eo.php | |
| parent | 9cd7bb2c8d7b7207a3c67e09158641b0c33e631d (diff) | |
| parent | 08d7b8ce309baebfc243727c215b63e732bf874e (diff) | |
| download | nextcloud-server-9671ace32e57ce6b176a50dc346baf3b3b7eb14e.tar.gz nextcloud-server-9671ace32e57ce6b176a50dc346baf3b3b7eb14e.zip | |
Merge branch 'master' into fix_minor_files_annoyances
Conflicts:
apps/files/js/files.js
Diffstat (limited to 'apps/files_versions/l10n/eo.php')
0 files changed, 0 insertions, 0 deletions