Merge remote-tracking branch 'origin/0.8'

Conflicts: CHANGELOG.md composer.lock
BootstrapCMS · Mar 15, 2015 · 4eba52c · 4eba52c
2 parents 6bb2237 + 4b19ac4
commit 4eba52c
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,11 @@ CHANGE LOG
 * Cleaned up assets
 
 
+## V0.8.5 Alpha (15/03/2015)
+
+* Updated dependencies
+
+
 ## V0.8.4 Alpha (11/03/2015)
 
 * Updated dependencies (fixes sentry vulnerability)