diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-18 14:19:58 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-18 14:19:58 +0200 |
| commit | 17337b22af1a5f0702b95f82d3f489cdeabea4be (patch) | |
| tree | 6d3bd908720ed7d4ca308a01bf79553f41b56b90 /core/js | |
| parent | ec1949f5ed595f3da5907d1493727e156ae9a5a7 (diff) | |
| parent | 1eb42626f5fd9f2a39f22efc735820fb83b2778b (diff) | |
| download | nextcloud-server-17337b22af1a5f0702b95f82d3f489cdeabea4be.tar.gz nextcloud-server-17337b22af1a5f0702b95f82d3f489cdeabea4be.zip | |
Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
apps/files/js/file-upload.js
Diffstat (limited to 'core/js')
0 files changed, 0 insertions, 0 deletions