aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZachary Scott <e@zzak.io>2016-02-05 19:56:54 +0900
committerZachary Scott <e@zzak.io>2016-02-05 19:56:54 +0900
commit2e1a4bd761a7996186daee4003d896e30d0458ab (patch)
tree11d8575b5c534c966120fc27a60f4d75ba4ec193
parentbe45d2f4774aff3b9de5602f974ada2668286623 (diff)
parent822e3c0b3ee39a03a6ba2d122fb479081f1e0c56 (diff)
downloadrails-2e1a4bd761a7996186daee4003d896e30d0458ab.tar.gz
rails-2e1a4bd761a7996186daee4003d896e30d0458ab.tar.bz2
rails-2e1a4bd761a7996186daee4003d896e30d0458ab.zip
Merge branch 'master' of github.com:rails/rails
-rw-r--r--railties/CHANGELOG.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index a1736470ae..8f4dc736a8 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,9 +1,9 @@
-## Rails 5.0.0.beta2 (February 01, 2016) ##
-
* Add dummy files for apple-touch-icon.png and apple-touch-icon.png. GH#23427
*Alexey Zabelin*
+## Rails 5.0.0.beta2 (February 01, 2016) ##
+
* Add `after_bundle` callbacks in Rails plugin templates. Useful for allowing
templates to perform actions that are dependent upon `bundle install`.