Merge branch '1.4'

Conflicts: Changelog.md bower.json dist/impac-angular.css dist/impac-angular.js dist/impac-angular.min.css dist/impac-angular.min.js package.json
maestrano · Mar 29, 2017 · 8a088a0 · 8a088a0
2 parents fff2639 + 35442ea
commit 8a088a0
Show file tree

Hide file tree

Showing 18 changed files with 7,188 additions and 7,036 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,8 +29,5 @@ scripts/
 # Generated filders
 reports/
 
-# Distribution
-dist/
-
 # Dev keys
 workspace/index.js
diff --git a/Changelog.md b/Changelog.md
@@ -8,6 +8,11 @@
 
 ## Released
 
+### v1.5.0-rc5 | 2017 - Week 13
+- add v1.4.9
+
+-------------------------------------------------------------
+
 ### v1.5.0-rc4 | 2017 - Week 8
 - add v1.4.8
 

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "impac-angular",
   "description": "Impac! Front-End Library",
-  "version": "1.5.0-rc4",
+  "version": "1.5.0-rc5",
   "main": [
     "dist/impac-angular.js",
     "dist/impac-angular.less",