Merge pull request bentorfs#26 from stand579/master

bentorfs · web-flow · commit b05e5e870b0f · 2016-12-12T15:33:49.000+01:00
Bump up version to 1.1.5
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - "0.10"
+  - "node"
 before_install:
   - npm install -g grunt-cli bower
   - bower install
diff --git a/bower.json b/bower.json
@@ -1,6 +1,5 @@
 {
   "name": "angular-bootstrap-multiselect",
-  "version": "1.1.3",
   "main": "dist/angular-bootstrap-multiselect.min.js",
   "ignore": [
     "src",
@@ -16,4 +15,4 @@
   "devDependencies": {
     "angular-mocks": ">=1.3.0"
   }
-}
+}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-bootstrap-multiselect",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "devDependencies": {
     "grunt": "~0.4.5",
     "grunt-bootlint": "~0.5.3",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "angular-bootstrap-multiselect",`
`3`		`- "version": "1.1.3",`
`4`	`3`	`"main": "dist/angular-bootstrap-multiselect.min.js",`
`5`	`4`	`"ignore": [`
`6`	`5`	`"src",`
`@@ -16,4 +15,4 @@`
`16`	`15`	`"devDependencies": {`
`17`	`16`	`"angular-mocks": ">=1.3.0"`
`18`	`17`	`}`
`19`		`-}`
	`18`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "angular-bootstrap-multiselect",`
`3`		`- "version": "1.1.3",`
	`3`	`+ "version": "1.1.5",`
`4`	`4`	`"devDependencies": {`
`5`	`5`	`"grunt": "~0.4.5",`
`6`	`6`	`"grunt-bootlint": "~0.5.3",`