Merge branch 'dev'

# Conflicts: # dist/AXJ.all.js
thomasJang · Apr 11, 2016 · 31dee17 · 31dee17
2 parents 351d26e + 99d75fa
commit 31dee17
Show file tree

Hide file tree

Showing 17 changed files with 4,353 additions and 4,115 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@ Thumbs.db
 .idea/
 node_modules/
 AXWBS/
-.project
+.project
+*.iml
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "axisj",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "homepage": "https://github.com/axisj-com/axisj",
     "authors": [
         "tom@axisj.com thomasJ and team axisj"