From 2c283c0164eff5a6a91d6085b3551242bba6ae7f Mon Sep 17 00:00:00 2001
From: Samuel De Backer <sdebacker@gmail.com>
Date: Mon, 13 Oct 2014 22:54:48 +0200
Subject: [PATCH] v1.5.4

---
 CHANGELOG.md  |  8 +++++++-
 composer.lock | 10 +++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f569d657..1119cc2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,17 @@
 # Changelog
 All notable changes to TypiCMS will be documented in this file.
 
-## 1.5.4 - 2014
+## 1.5.4 - 2014-10-13
+
+### Added
+- Tests for groups and users admin controllers.
 
 ### Changed
 - Front office views for http errors extends master.blade.php.
 
+### Fixed
+- Bug with groups
+
 ## 1.5.3 - 2014-10-13
 
 ### Fixed
diff --git a/composer.lock b/composer.lock
index d4b6abe5..9a3f43c6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -76,16 +76,16 @@
         },
         {
             "name": "bkwld/croppa",
-            "version": "3.4.0",
+            "version": "3.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/BKWLD/croppa.git",
-                "reference": "688259916d34dcb73ee67538dbbfbd9558e414ba"
+                "reference": "cbd46bdc6f790f35f6378aa92aa97a208c193141"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/BKWLD/croppa/zipball/688259916d34dcb73ee67538dbbfbd9558e414ba",
-                "reference": "688259916d34dcb73ee67538dbbfbd9558e414ba",
+                "url": "https://api.github.com/repos/BKWLD/croppa/zipball/cbd46bdc6f790f35f6378aa92aa97a208c193141",
+                "reference": "cbd46bdc6f790f35f6378aa92aa97a208c193141",
                 "shasum": ""
             },
             "require": {
@@ -116,7 +116,7 @@
                 }
             ],
             "description": "Image thumbnail creation through specially formatted URLs for Laravel",
-            "time": "2014-08-06 17:30:41"
+            "time": "2014-10-13 16:37:08"
         },
         {
             "name": "cartalyst/sentry",