Preparing for 1.0.5

dflydev · Jun 17, 2014 · c5820e9 · c5820e9
1 parent 25628e4
commit c5820e9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -35,10 +35,5 @@
             "Dflydev\\Pimple\\Provider\\DoctrineOrm": "src",
             "Dflydev\\Silex\\Provider\\DoctrineOrm": "src"
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0-dev"
-        }
     }
 }