1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
rails--rails/guides
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
..
assets Merge pull request #6383 from oscardelben/add_oscardelben_to_authors 2012-05-23 10:49:06 -07:00
code/getting_started Remove :confirm in favor of :data => { :confirm => 'Text' } option 2012-07-18 10:32:17 -03:00
rails_guides [guides] fix reference to railties directory, guides are no longer there 2012-05-28 16:21:25 -05:00
source Merge branch 'master' of github.com:lifo/docrails 2012-08-04 15:18:35 +05:30
rails_guides.rb Remove remaining require 'rubygems' 2012-05-13 13:33:20 -03:00
Rakefile [guides] guides:generate:kindle is the new interface to generate .mobi file instead of using KINDLE=1 2012-05-28 16:20:10 -05:00
w3c_validator.rb Remove remaining require 'rubygems' 2012-05-13 13:33:20 -03:00