aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/timestamp.rb
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2014-01-22 08:28:45 -0800
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2014-01-22 08:28:45 -0800
commit0d24946903853e09fce1824d28d3ad7b210b71b5 (patch)
tree61f55f78aa59a595c7b0eec818bd291d38484dab /activerecord/lib/active_record/timestamp.rb
parent8f17a834ae98cea28ceff22bf11ce346b867bc90 (diff)
parentce91efed652bbcec42dbc68e421f717fb2ecc9b8 (diff)
downloadrails-0d24946903853e09fce1824d28d3ad7b210b71b5.tar.gz
rails-0d24946903853e09fce1824d28d3ad7b210b71b5.tar.bz2
rails-0d24946903853e09fce1824d28d3ad7b210b71b5.zip
Merge pull request #13791 from kei-s/remove_duplicate_merge
Remove duplicate merge
Diffstat (limited to 'activerecord/lib/active_record/timestamp.rb')
0 files changed, 0 insertions, 0 deletions