aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-05-02 12:56:45 -0700
committerJosé Valim <jose.valim@gmail.com>2011-05-02 12:56:45 -0700
commit7f5ff5df2dc2dd8d9aea4e3d944b41f89e1fb3da (patch)
treef77317dae48ff0b841bc71950a62c9f771cc2847 /actionpack
parent951e18abea9c116fc5d6b330ca1dcd2890abe006 (diff)
parentc577f186aa4b7bcf12acfcc5b7fc7760d96cc663 (diff)
downloadrails-7f5ff5df2dc2dd8d9aea4e3d944b41f89e1fb3da.tar.gz
rails-7f5ff5df2dc2dd8d9aea4e3d944b41f89e1fb3da.tar.bz2
rails-7f5ff5df2dc2dd8d9aea4e3d944b41f89e1fb3da.zip
Merge pull request #367 from sikachu/credit_changelog.
Update CHANGELOG file to mention my name
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG4
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 76dbfe7895..07a23ddb63 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -4,7 +4,9 @@
* Implicit actions named not_implemented can be rendered [Santiago Pastorino]
-* Wildcard route will always matching the optional format segment by default. For example if you have this route:
+* Wildcard route will always matching the optional format segment by default. [Prem Sichanugrist]
+
+ For example if you have this route:
map '*pages' => 'pages#show'