Merge remote-tracking branch 'origin/master'

eaa4ee48 · panpp · 1fda008a · 8e233e19 · 1fda008a · 1fda008a
Commit eaa4ee48 authored Jun 23, 2020 by panpp
--- a/src/main/webapp/static/plugins/jquery.swfupload/1.0.0/upload_pic.png
+++ b/src/main/webapp/static/plugins/jquery.swfupload/1.0.0/upload_pic.png
--- a/src/main/webapp/static/plugins/jquery.touchswipe/1.6/jquery.touchSwipe.min.js
+++ b/src/main/webapp/static/plugins/jquery.touchswipe/1.6/jquery.touchSwipe.min.js