aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-01-07 17:53:23 -0200
committerRafael França <rafaelmfranca@gmail.com>2016-01-07 17:53:23 -0200
commitb4f28dbb39f29fcb0b0393b26ef31f1f6fbe0679 (patch)
tree2801cb256b4b7007e59b24d91152000fcfca66be
parent43ccebc1db072ba0c96a67de0b3db78fd8fd0973 (diff)
parent77d01e36aadc71cf6b757ef3e265d2b6ef51a562 (diff)
downloadrails-b4f28dbb39f29fcb0b0393b26ef31f1f6fbe0679.tar.gz
rails-b4f28dbb39f29fcb0b0393b26ef31f1f6fbe0679.tar.bz2
rails-b4f28dbb39f29fcb0b0393b26ef31f1f6fbe0679.zip
Merge pull request #22966 from mastahyeti/add_greg
Fix changelog for per-form CSRF tokens
-rw-r--r--actionpack/CHANGELOG.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index a732622b00..69761d16b8 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -16,7 +16,7 @@
* Add option for per-form CSRF tokens.
- *Ben Toews*
+ *Greg Ose & Ben Toews*
* Add tests and documentation for `ActionController::Renderers::use_renderers`.