aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/test/cases/helper.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-04-23 01:11:24 +0200
committerXavier Noria <fxn@hashref.com>2011-04-23 01:11:24 +0200
commitaf1b48926f49226c934995c322ee017239158cf3 (patch)
treea496e072226dc4c16f70b5d74cb7eb800391fa82 /activemodel/test/cases/helper.rb
parentf7538808d466b756df15ac3f27ca08370f7a189c (diff)
parentdf70b9dfb23aa05ed7ae7955ff0fb7eec68de9a3 (diff)
downloadrails-af1b48926f49226c934995c322ee017239158cf3.tar.gz
rails-af1b48926f49226c934995c322ee017239158cf3.tar.bz2
rails-af1b48926f49226c934995c322ee017239158cf3.zip
Merge branch 'master' of git://github.com/lifo/docrails
Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
Diffstat (limited to 'activemodel/test/cases/helper.rb')
0 files changed, 0 insertions, 0 deletions