diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-06 22:40:35 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-06 22:40:35 +0100 |
| commit | bae175518427de1f43ac23dbc1e06a15f6933370 (patch) | |
| tree | 90cdee24789526b1b6da16eda90e2c1547a66e62 /apps/user_ldap/l10n/fi_FI.php | |
| parent | 39d874cd902a4e3d4f7ae313ec5e15bafe35df13 (diff) | |
| parent | 08d7b8ce309baebfc243727c215b63e732bf874e (diff) | |
| download | nextcloud-server-bae175518427de1f43ac23dbc1e06a15f6933370.tar.gz nextcloud-server-bae175518427de1f43ac23dbc1e06a15f6933370.zip | |
Merge branch 'master' into fixing-784-master
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
lib/helper.php
Diffstat (limited to 'apps/user_ldap/l10n/fi_FI.php')
0 files changed, 0 insertions, 0 deletions