Merge branch 'develop'

xpressengine · Jun 9, 2015 · 926be7d · 926be7d
2 parents 9809ae8 + 8c32eba
commit 926be7d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/common/js/plugins/jquery.fileupload/js/main.min.js b/common/js/plugins/jquery.fileupload/js/main.min.js