Changeset [80de91c7d84cbbcad5e4149cfac37fba2c826845] by Marnen Laibow-Koser
Revision 80de91c7d84cbbcad5e4149cfac37fba2c826845,
committed by Marnen Laibow-Koser
· September 21st, 2011 @ 02:29 PM
Merge branch 'capybara-nesting' into 56-rails3-deprecations
Conflicts:
spec/views/calendars/users.html.haml_spec.rb
https://github.com/marnen/quorum2/commit/80de91c7d84cbbcad5e4149cfa...
5 changed files
-
M
Gemfile -
M
Gemfile.lock -
M
spec/controllers/permissions_controller_spec.rb -
M
spec/views/calendars/users.html.haml_spec.rb -
M
spec/views/events/index.html.haml_spec.rb