diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2013-02-19 19:12:14 -0500 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2013-02-19 19:12:14 -0500 |
| commit | 702c27b0e63cddb21f483c0a69e899e08b42ec07 (patch) | |
| tree | 5235c4b45c2de00c9d5633e25ad5142388587f1f /l10n/sw_KE/core.po | |
| parent | 037c3ee4ecf6f3ffae0f1707074ac13b234dc1ec (diff) | |
| parent | 38782036798dbe0a34995a3fca0aa92583cb9099 (diff) | |
| download | nextcloud-server-702c27b0e63cddb21f483c0a69e899e08b42ec07.tar.gz nextcloud-server-702c27b0e63cddb21f483c0a69e899e08b42ec07.zip | |
Merge branch 'master' into external_storage_ui_feedback
Conflicts:
apps/files_external/js/settings.js
apps/files_external/lib/smb.php
apps/files_external/templates/settings.php
lib/files/storage/common.php
Diffstat (limited to 'l10n/sw_KE/core.po')
0 files changed, 0 insertions, 0 deletions