Merge branch 'master' of github.com:derjust/jquery-file-upload-middle… · aguidrevitch/jquery-file-upload-middleware@c898f40 · GitHub

Commit

Merge branch 'master' of github.com:derjust/jquery-file-upload-middle…

Browse files

…ware

Conflicts:
	lib/uploadhandler.js

Loading branch information

Sebastian.Just committed Sep 4, 2014

2 parents fbc3064 + e43100a commit c898f40