• E
    Merge commit 'rails/master' · 0e2fbd80
    Emilio Tagua 提交于
    Conflicts:
    	activerecord/lib/active_record/calculations.rb
    	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
    	activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
    0e2fbd80
base.rb 136.8 KB