Changeset [49963f92c8f9b247d0197d61f816f67e79bf9b0e] by Shawn Balestracci
Revision 49963f92c8f9b247d0197d61f816f67e79bf9b0e,
committed by Shawn Balestracci
· August 25th, 2012 @ 08:23 PM
Merge branch 'master' into ruby_1.9.3
Conflicts:
lib/tasks/verify_rcov.rake
https://github.com/vegantech/sims/commit/49963f92c8f9b247d0197d61f8...
2 changed files
-
M
app/helpers/links_and_attachments_helper.rb -
M
spec/helpers/links_and_attachments_spec.rb