Changeset [c505416b918764cd9676ff63734321a35e3f771f] by Marnen Laibow-Koser
Revision c505416b918764cd9676ff63734321a35e3f771f,
committed by Marnen Laibow-Koser
· August 8th, 2013 @ 11:16 PM
Merge branch 'master' into 54-remove-controller-and-view-specs
Conflicts:
spec/views/events/_attendance.html.haml_spec.rb
spec/views/events/_event.html.haml_spec.rb
https://github.com/marnen/quorum2/commit/c505416b918764cd9676ff6373...
11 changed files
-
A
.rspec.travis -
A
.travis.yml -
A
README.md -
A
ci/before_script.sh -
A
ci/create_config_files.sh -
A
ci/install_postgis.sh -
A
lib/tasks/ci.rake -
R
README -
M
Gemfile -
M
features/support/additional_cucumber_setup.rb -
M
spec/views/events/_event.html.haml_spec.rb