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

Conflicts: CHANGELOG.md
sulu · Mar 15, 2019 · cca7f17 · cca7f17
2 parents 0fec84b + fc7bc82
commit cca7f17
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
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": {