Merge branch '1-4-stable'

Conflicts: CHANGELOG.md gemfiles/Gemfile.rails-3.X gemfiles/Gemfile.rails-4.0 lib/generators/public_activity/migration_upgrade/migration_upgrade_generator.rb lib/public_activity/version.rb
public-activity · Aug 19, 2014 · 1174630 · 1174630
2 parents 4ea9f56 + 9a058a2
commit 1174630
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,10 @@ This version brings a lot of API changes and improvements.
 
 * Configurable fallbacks for activity partials. See [#148](https://github.com/pokonski/public_activity/pull/148) (thanks to [Chris Shorrock](https://github.com/shorrockin))
 
+## 1.4.2
+
+* Fix bug with migrations not having an extension in ActiveRecord >= 4.0.0
+>>>>>>> 1-4-stable
 
 ## 1.4.1