Changeset [e16fd305b9646e8e853cf7e3617936fa1cd098c4] by Yomi Colledge
Revision e16fd305b9646e8e853cf7e3617936fa1cd098c4,
committed by Yomi Colledge
· May 18th, 2010 @ 04:16 PM
Merge branch 'lighthouse_integration' of github.com:baphled/salad into lighthouse_integration
Conflicts:
features/plain/lighthouse_integration.feature
http://github.com/baphled/salad/commit/e16fd305b9646e8e853cf7e36179...
7 changed files
-
M
app/controllers/parking_controller.rb -
M
app/views/parking/index.html.erb -
M
app/views/parking/tickets.html.erb -
M
features/plain/lighthouse_integration.feature -
M
features/step_definitions/lighthouse_integration_steps.rb -
M
spec/controllers/parking_controller_spec.rb -
M
spec/views/parking/index.html.erb_spec.rb