]> source.dussan.org Git - nextcloud-server.git/commit
Merge pull request #5262 from owncloud/files-ie8-conflictdialogbrokenfix
authorMorris Jobke <morris.jobke@gmail.com>
Wed, 16 Oct 2013 19:52:41 +0000 (12:52 -0700)
committerMorris Jobke <morris.jobke@gmail.com>
Wed, 16 Oct 2013 19:52:41 +0000 (12:52 -0700)
commita132144ecab68357abd9f387b41fc868b5b01981
tree3042a543f935fa012df0b7c087380d8a71010480
parent2fe9294c5d65e7e2264a8ddf10985bdd00c83a5a
parente2a4417079c2ddd1263ec9af2d2930eb65e911f7
Merge pull request #5262 from owncloud/files-ie8-conflictdialogbrokenfix

Fixed conflict dialog in IE8
apps/files/js/file-upload.js