Skip to content
Browse files

prep for 1.2.0 release

  • Loading branch information...
1 parent 4772d45 commit 409766e7a2a145d341a11276f6e7c92c46212d5a @pmjones pmjones committed May 31, 2014
Showing with 4 additions and 4 deletions.
  1. +3 −3 meta/changes.txt
  2. +1 −1 meta/require.csv
View
6 meta/changes.txt
@@ -1,5 +1,5 @@
-- [DOC] Add PHP 5.5 to Travis build, update README and LICENSE.
+- Add methods Map::appendMap() and Map::prependMap(), to append or prepend the definitions from another map.
-- [ADD] Route::__isset()
+- Add test for Route::__isset()
-- [CHG] Route::attach() now works with an empty path
+- Remove 'router_map' service from config; leave this for the framework-level config
View
2 meta/require.csv
@@ -1,2 +1,2 @@
php,>=5.4.0
-aura/installer-default,>=1.0.0
+aura/installer-default,1.0.*

0 comments on commit 409766e

Please sign in to comment.
Something went wrong with that request. Please try again.