Vijay Dev 3d3fa165e4 Merge branch 'master' of github.com:lifo/docrails ... Conflicts: activemodel/lib/active_model/secure_password.rb activerecord/lib/active_record/associations/collection_proxy.rb		2012-08-04 15:18:35 +05:30
..
active_model	Merge branch 'master' of github.com:lifo/docrails	2012-08-04 15:18:35 +05:30
active_model.rb	defines a private require-hub active_support/rails	2012-08-02 21:59:22 +02:00