diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-19 17:00:54 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-19 17:00:54 +0200 |
| commit | 7e0631b3b81a5669620122964d0326ead187de30 (patch) | |
| tree | 9370b9d5ac99f148d2bc724f76c805b772af7d2d /core/l10n/nqo.php | |
| parent | 98ff8478301676c99ffefd5756ad22466dfb6acf (diff) | |
| parent | bd5cb1d801a16933b7b75af5c514caec2afa5fef (diff) | |
| download | nextcloud-server-7e0631b3b81a5669620122964d0326ead187de30.tar.gz nextcloud-server-7e0631b3b81a5669620122964d0326ead187de30.zip | |
Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
apps/files/js/filelist.js
Diffstat (limited to 'core/l10n/nqo.php')
0 files changed, 0 insertions, 0 deletions