Rafael Mendonça França 3f47fd0d23 Merge remote-tracking branch 'origin/master' into rm-wrapper-classes ... Conflicts: CHANGELOG.md lib/simple_form/inputs/boolean_input.rb		2014-03-14 18:59:40 -03:00
..
discovery_inputs.rb	Pass the options hash instead of the Leaf object	2014-03-11 19:41:25 -03:00
misc_helpers.rb	Merge remote-tracking branch 'origin/master' into rm-wrapper-classes	2014-03-14 18:59:40 -03:00
mock_controller.rb	Update the MockController code to work with Rails 4	2012-12-13 15:16:12 -03:00
models.rb	Whitespaces	2014-03-11 19:13:59 -03:00