]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into fix_jslint_kondou
authorkondou <kondou@ts.unde.re>
Sat, 17 Aug 2013 22:38:52 +0000 (00:38 +0200)
committerkondou <kondou@ts.unde.re>
Sat, 17 Aug 2013 22:38:52 +0000 (00:38 +0200)
commitedd92e4c09151238a89816186914f9382293ab9b
treee25d87cecf45ff2c2189198e5369f7754e01873a
parent1348330c7d75d2b60d845a43be57dedc6199ea1a
parent12f4494de02457d51004ca6a82c1b2160189819f
Merge branch 'master' into fix_jslint_kondou

Conflicts:
apps/files/js/file-upload.js
apps/files/js/file-upload.js
apps/files/js/fileactions.js
apps/files_versions/js/versions.js
core/js/oc-dialogs.js
core/js/share.js
settings/js/apps.js