Merge branch 'release/1.4.0' into develop

markround · Jun 14, 2018 · f4c9d86 · f4c9d86
2 parents 01ccb4c + f735b56
commit f4c9d86
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,4 +1,8 @@
 # 1.x
+  * 1.4.0 (14/Jun/2018)
+    * Two new user-contributed plugins which allow you to [reuse templates](plugins/reusable.md) and [perform regex replacements](plugins/regex.md) inside existing files. Many thanks to the awesome work of [dmarchewka](https://github.com/dmarchewka) for the great PR, tests and documentation. 
+    * Log output now includes timestamp and verbosity level. Again, thanks to [dmarchewka](https://github.com/dmarchewka) for supplying this pull request.
+
   * 1.3.0 (10/Apr/2018)
     * Miscellaneous bug fixes and some preparation work for future 2.0 releases
     * Fixed [Issue #65](https://github.com/markround/tiller/issues/65), again thanks to [Pablo Gonzalez](https://github.com/kydorn) for reporting the issue and providing the PR to fix the issue.

diff --git a/lib/tiller/version.rb b/lib/tiller/version.rb
@@ -1,3 +1,3 @@
 # http://semver.org/
-VERSION="1.3.0"
+VERSION="1.4.0"
 SUPPORTED_RUBY_VERSION="2.2.0"