Merge branch 'release/1.5.0' into develop

2016-07-14 17:56:50 +02:00 · 2016-07-14 17:56:50 +02:00 · b748d63fe6
commit b748d63fe6
parent 8277d0f869 20f4a19b62
3 changed files with 15 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,3 @@
 .sass-cache
+
+.DS_Store
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,15 @@
+# v1.5.0
+## 07/14/2016
+
+1. [](#improved)
+    * Remove unneeded streams from Theme YAML
+    * Delete unused composer.json
+    * Add the `theme_config` twig var
+1. [](#bugfix)
+    * Fix missing fontawesome-webfont.woff2 file
+    * Fix slider buttons on tablet
+    * Fix setting the page language in the html tag
+    
 # v1.4.0
 ## 01/06/2016

--- a/blueprints.yaml
+++ b/blueprints.yaml
@ -1,5 +1,5 @@
 name: Deliver
-version: 1.4.0
+version: 1.5.0
 description: "Deliver theme is a port of the Michael Reimer's Deliver Free PSD theme."
 icon: newspaper-o
 author: