heartcombo--simple_form/lib
Rafael Mendonça França cae72bfca8 Merge branch 'master' into rails_4
Conflicts:
	lib/simple_form/action_view_extensions/builder.rb
	test/action_view_extensions/builder_test.rb
2013-01-02 11:59:53 -03:00
..
generators/simple_form SimpleForm no longer sets the `size` attribute by itself. 2012-12-27 19:39:32 -02:00
simple_form Merge branch 'master' into rails_4 2013-01-02 11:59:53 -03:00
simple_form.rb SimpleForm no longer sets the `size` attribute by itself. 2012-12-27 19:39:32 -02:00