From c5820e9e14884ebca9419bc3ceafe52899be6d5a Mon Sep 17 00:00:00 2001
From: Beau Simensen <beau@dflydev.com>
Date: Tue, 17 Jun 2014 17:52:19 -0500
Subject: [PATCH] Preparing for 1.0.5

---
 changelog.md  | 5 +++++
 composer.json | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/changelog.md b/changelog.md
index adbe57c..cab5541 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,8 @@
+## v1.0.5 (2014-06-17)
+
+ * @c960657: Support remaining config options (#22)
+ * @iolloyd: Remove unneeded passing of Pimple $app (#25)
+
 ## v1.0.4 (2013-12-11)
 
  * @mrkrstphr: Custom types (#21)
diff --git a/composer.json b/composer.json
index 76db2ae..7f7a088 100644
--- a/composer.json
+++ b/composer.json
@@ -35,10 +35,5 @@
             "Dflydev\\Pimple\\Provider\\DoctrineOrm": "src",
             "Dflydev\\Silex\\Provider\\DoctrineOrm": "src"
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0-dev"
-        }
     }
 }