Merge branch 'dev' into hohoTT-dev

2015-08-26 17:01:50 +08:00
parent 3e7dfa9dc8 b4224846d0
commit 7383b0f138
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.
+ */