Changeset [a8893b44eed97b4f20e52a576add57977dd3d606] by Graeme Worthy
Revision a8893b44eed97b4f20e52a576add57977dd3d606,
committed by Graeme Worthy
· May 2nd, 2009 @ 09:22 PM
Merge branch 'krh-merge'
- krh-merge: beta images tidied up some of the version text and partialized the version info box removed compass gem which isn't being used anymore added specifications to stop getting specification warnings on rspec
Conflicts:
spec/controllers/versions_controller_spec.rb
spec/models/rating_spec.rb
9 changed files
-
M
app/controllers/versions_controller.rb -
M
app/models/page.rb -
M
app/views/pages/_version_info.html.erb -
M
app/views/pages/show.html.erb -
M
public/images/brain-beta2.png -
M
spec/controllers/pages_controller_spec.rb -
M
spec/controllers/versions_controller_spec.rb -
M
spec/models/rating_spec.rb -
M
vendor/gems/haml-2.0.9/.specification