diff options
author | Simon Birnbach <simon@simon-birnbach.de> | 2012-04-15 23:52:36 +0200 |
---|---|---|
committer | Simon Birnbach <simon@simon-birnbach.de> | 2012-04-15 23:52:36 +0200 |
commit | 965a8ba2c60eb04e2f65a4ace215113ac61f7c98 (patch) | |
tree | 38292db21226c43c41ce68eb2ccd638d457e678d /files/js/jquery.fileupload.js | |
parent | 8e27b725ba2aa26cb9037b44b18ff800649017b1 (diff) | |
download | nextcloud-server-965a8ba2c60eb04e2f65a4ace215113ac61f7c98.tar.gz nextcloud-server-965a8ba2c60eb04e2f65a4ace215113ac61f7c98.zip |
Fixed cancelling of uploads and wrong merge conflict resolution
Diffstat (limited to 'files/js/jquery.fileupload.js')
0 files changed, 0 insertions, 0 deletions