Changeset [1ca1856e7d7ea4cf43b31b9b2a9c368d43800a83] by Kalin Harvey
Revision 1ca1856e7d7ea4cf43b31b9b2a9c368d43800a83,
committed by Kalin Harvey
· May 22nd, 2009 @ 04:44 AM
Merge branch 'master' of git@github.com:greenbuilding/greenbuildingbrain
- 'master' of git@github.com:greenbuilding/greenbuildingbrain: ratings superclass in sidebar
Conflicts:
app/views/items/show.html.erb
2 changed files
-
M
app/views/items/_gallery.html.erb -
M
public/stylesheets/greenbuildingmap.css