diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-10-30 13:41:10 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-10-30 13:41:10 +0100 |
| commit | c9f3f2874f3136342965a1d255d030de87725519 (patch) | |
| tree | 8a9ca523992d2b461d71c3483bd1e0b31dae4f7a /l10n/si_LK/lib.po | |
| parent | 654b0daf0145b216d81347325b17cf522a49ec81 (diff) | |
| parent | 4c964cbbbe2b92d6220410cda5e7905e529fc713 (diff) | |
| download | nextcloud-server-c9f3f2874f3136342965a1d255d030de87725519.tar.gz nextcloud-server-c9f3f2874f3136342965a1d255d030de87725519.zip | |
Merge branch 'master' into update-parent-storage-mtime
Conflicts:
lib/private/files/cache/updater.php
Diffstat (limited to 'l10n/si_LK/lib.po')
0 files changed, 0 insertions, 0 deletions