Merge branch '1.5' of github.com:massiveart/web-js

alexander-schranz · alexander-schranz · commit cca7f176d75c · 2019-03-15T14:45:07.000+01:00
Conflicts:
	CHANGELOG.md
diff --git a/.gitignore b/.gitignore
@@ -15,5 +15,6 @@ Thumbs.db
 /node_modules
 yarn-error.log
 yarn.lock
+package-json.lock
 
 !**/.gitkeep
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,10 @@
  - FEATURE: Add support for multiple arguments in service call. #36
  - ENHANCEMENT: Rename src folder to js. #35
 
+## 1.5.1
+
+ - ENHANCEMENT: Add package-json.lock file to gitignore. #41
+
 ## 1.5.0
 
  - FEATURE: Added truncate component. #32
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "massive-web",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "Manage your js components",
   "main": "js/core.js",
   "repository": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "massive-web",`
`3`		`- "version": "1.5.0",`
	`3`	`+ "version": "1.5.2",`
`4`	`4`	`"description": "Manage your js components",`
`5`	`5`	`"main": "js/core.js",`
`6`	`6`	`"repository": {`