Preparing for 1.0.5

simensen · simensen · commit c5820e9e1488 · 2014-06-17T17:52:19.000-05:00
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"
-        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,5 @@`
`35`	`35`	`"Dflydev\\Pimple\\Provider\\DoctrineOrm": "src",`
`36`	`36`	`"Dflydev\\Silex\\Provider\\DoctrineOrm": "src"`
`37`	`37`	`}`
`38`		`- },`
`39`		`- "extra": {`
`40`		`- "branch-alias": {`
`41`		`- "dev-master": "1.0-dev"`
`42`		`- }`
`43`	`38`	`}`
`44`	`39`	`}`