]> source.dussan.org Git - nextcloud-server.git/commit
remove merge conflicts fail
authorGeorg Ehrke <dev@georgswebsite.de>
Thu, 26 Apr 2012 19:23:38 +0000 (21:23 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Thu, 26 Apr 2012 19:23:38 +0000 (21:23 +0200)
commit6039dd0fe869fceb5c54aef9cb68ceb2485877e4
treeee528cb030af8d25f9b22df8581b7fa2d3280be6
parent2b10371bdeb2c8a3d5cc2617ada5cf8195c264c9
remove merge conflicts fail
files/js/jquery.fileupload.js [deleted file]
files/js/jquery.iframe-transport.js [deleted file]