Merge branch 'master' of https://github.com/prepair/basic-loader

Kurdi Szabolcs · Kurdi Szabolcs · commit 76a82ed243ee · 2017-02-16T10:31:19.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,11 @@
+# Change Log
+
+All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+
+<a name="1.1.0"></a>
+# 1.1.0 (2017-02-15)
+
+
+### Features
+
+* initial release ([68f8565](https://github.com/prepair/basic-loader/commit/68f8565))
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ Promise.all([
   this is caused by an old phantomjs version in the _mocha-phantomjs_ package.
   [Issue is here](https://github.com/nathanboktae/mocha-phantomjs/issues/248)
   * either wait for the upstream package to be updated 
-  * or update the binary manually
+  * or update the binary manually (inside node_modules)
 
 ## exposed test
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@prepair/basic-loader",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "David Walsh's super simple loader for loading image, CSS, and JavaScript files.",
   "main": "lib/basic-loader.js",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@prepair/basic-loader",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.1.0",`
`4`	`4`	`"description": "David Walsh's super simple loader for loading image, CSS, and JavaScript files.",`
`5`	`5`	`"main": "lib/basic-loader.js",`
`6`	`6`	`"scripts": {`