Changeset [a8f74f12d6a809eea3cf8e150f4ac4f6fa5e7322] by Graeme Worthy
April 22nd, 2009 @ 03:31 AM
Merge branch 'dashboard' of git://github.com/krrh/greenbuildingbrain into dashboard
- 'dashboard' of git://github.com/krrh/greenbuildingbrain: Added code for sidebar on dashboard, fixed errant user_spec file, added creator/editor to building fixtures
Conflicts:
app/controllers/dashboard_controller.rb
Committed by Graeme Worthy
- M app/controllers/dashboard_controller.rb
- M app/views/dashboard/index.html.erb
- M spec/fixtures/buildings.yml
- M spec/user_spec.rb
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป
The Green Building Brain is an open source and open content tool for collaboration and resource sharing between green building professionals and amateurs.