Merge branch 'dev' into dev-sxw

Nothing~
2015-08-26 09:19:51 +08:00
parent 064effe3bf b4224846d0
commit f2fb71b833
50 changed files with 117 additions and 81 deletions
--- a/static/release/fis-conf.js
+++ b/static/release/fis-conf.js
@@ -0,0 +1,3 @@
+/**
+ * Created by virusdefender on 8/25/15.
+ */