diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-16 10:42:37 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-16 10:42:37 +0200 |
| commit | 82cbbb8ab8cfe81559c45905d7fca819d71df346 (patch) | |
| tree | 947d58076dae8d5c4d0bd001ccebbe079448e057 /l10n/mk/lib.po | |
| parent | 1558cb860c2fb26fdde14fce2a16acbb29d12b3e (diff) | |
| parent | 46f59b165e5bd1908509e8a62b67bf983cfd6224 (diff) | |
| download | nextcloud-server-82cbbb8ab8cfe81559c45905d7fca819d71df346.tar.gz nextcloud-server-82cbbb8ab8cfe81559c45905d7fca819d71df346.zip | |
Merge branch 'master' into encryption_improved_error_messages_4617
Conflicts:
apps/files/index.php
Diffstat (limited to 'l10n/mk/lib.po')
0 files changed, 0 insertions, 0 deletions