Skip to content

Commit 31dee17

Browse files
committed
Merge branch 'dev'
# Conflicts: # dist/AXJ.all.js
2 parents 351d26e + 99d75fa commit 31dee17

File tree

17 files changed

+4353
-4115
lines changed

17 files changed

+4353
-4115
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ Thumbs.db
33
.idea/
44
node_modules/
55
AXWBS/
6-
.project
6+
.project
7+
*.iml

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "axisj",
3-
"version": "1.1.1",
3+
"version": "1.1.2",
44
"homepage": "https://github.com/axisj-com/axisj",
55
"authors": [
66
"tom@axisj.com thomasJ and team axisj"

0 commit comments

Comments
 (0)