aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-03-18 18:18:55 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-03-18 18:18:55 -0300
commita8e7a009d22f787046954b9e043363940deca3da (patch)
treea655be653aa484951298c23a0648fd17d41c1cdf /activerecord
parentafcd01bf25c0d7742d07b10dd8a465cffef4b9fe (diff)
downloadrails-a8e7a009d22f787046954b9e043363940deca3da.tar.gz
rails-a8e7a009d22f787046954b9e043363940deca3da.tar.bz2
rails-a8e7a009d22f787046954b9e043363940deca3da.zip
Fix changelog conflicts and remove release dates [ci skip]
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 43c1a4565f..f9c55ba0f4 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Rails 3.2.13 (Feb 17, 2013) ##
+## unrelesed ##
* Reload the association target if it's stale. `@stale_state` should be nil
when a model isn't saved.
@@ -13,7 +13,7 @@
*kennyj*
-## Rails 3.2.13.rc1 (Feb 17, 2013) ##
+## Rails 3.2.13 ##
* Reverted 921a296a3390192a71abeec6d9a035cc6d1865c8, 'Quote numeric values
compared to string columns.' This caused several regressions.