inherited_resources.rb
52 Bytes
-
89595a9a Merge remote branch 'boblail/merge-rebase' into boblail. Tweaked some changed fi… ... Browse Code »
…les, fixed whitespace, upgraded RSpec to 2.6.0 Conflicts: app/helpers/errs_helper.rb app/mailers/mailer.rb app/models/notice.rb app/views/errs/_table.html.haml app/views/errs/show.html.haml app/views/notices/_summary.html.haml spec/models/issue_trackers/redmine_tracker_spec.rb spec/views/errs/show.html.haml_spec.rb