diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-11-14 20:57:29 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-11-14 20:57:29 +0100 |
| commit | 617dc0e468cd285a28f337c565f9f9ae1aa2e85f (patch) | |
| tree | d239833a66fb38a5f46f0b5bdb353ff478e267ca /settings/l10n/hi.php | |
| parent | 99ee95d46c3e14cb902493df3201a2c1ad9d6dc5 (diff) | |
| parent | ecc7b01cee466d4893f8199abaee363c6bc4dac9 (diff) | |
| download | nextcloud-server-617dc0e468cd285a28f337c565f9f9ae1aa2e85f.tar.gz nextcloud-server-617dc0e468cd285a28f337c565f9f9ae1aa2e85f.zip | |
Merge branch 'master' into moviepreviewfallback
Conflicts:
lib/private/preview/movies.php
Diffstat (limited to 'settings/l10n/hi.php')
0 files changed, 0 insertions, 0 deletions