Changeset [819ddc93957e192ba63ebc887e23df1e149990f7] by Kalin Harvey
Revision 819ddc93957e192ba63ebc887e23df1e149990f7,
committed by Kalin Harvey
· March 9th, 2010 @ 06:39 PM
Merge branch 'master' of git://github.com/rtlechow/greenbuildingbrain into dude
- 'master' of git://github.com/rtlechow/greenbuildingbrain: Remove spec setup cruft. Fix broken item controller example.
Conflicts:
spec/controllers/items_controller_spec.rb
spec/models/page_spec.rb
spec/models/product_spec.rb
http://github.com/greenbuilding/greenbuildingbrain/commit/819ddc939...
3 changed files
-
M
spec/controllers/items_controller_spec.rb -
M
spec/models/page_spec.rb -
M
spec/models/product_spec.rb