Vijay Dev 6d8c070821 Merge branch 'master' of github.com:lifo/docrails ... Conflicts: activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb activerecord/test/cases/adapter_test.rb guides/source/testing.md [ci skip]		2013-03-30 15:46:14 +05:30
..
active_record	Merge branch 'master' of github.com:lifo/docrails	2013-03-30 15:46:14 +05:30
rails/generators	Add support for generate scaffold password:digest	2013-03-13 16:06:33 -04:00
active_record.rb	…