Conflicts: app/controllers/user_controller.rb app/views/user/terms.html.erb config/locales/en.yml |
||
---|---|---|
.. | ||
fixtures | ||
functional | ||
integration | ||
unit | ||
test_helper.rb |
Conflicts: app/controllers/user_controller.rb app/views/user/terms.html.erb config/locales/en.yml |
||
---|---|---|
.. | ||
fixtures | ||
functional | ||
integration | ||
unit | ||
test_helper.rb |