Changeset [3e5188c455797c539323b8287164a9fa8cba8de9] by Alex Grunenfelder
Revision 3e5188c455797c539323b8287164a9fa8cba8de9,
committed by Alex Grunenfelder
· April 22nd, 2010 @ 02:16 PM
Merge branch 'master' of git://github.com/greenbuilding/greenbuildingbrain into dcs_portal
- 'master' of git://github.com/greenbuilding/greenbuildingbrain: made title of toc more clear for empty descriptions prompt users to add images if there are none fixed links to edit description
Conflicts:
app/views/items/_gallery.html.erb
app/views/items/_toc.html.erb
http://github.com/greenbuilding/greenbuildingbrain/commit/3e5188c45...
3 changed files
-
M
app/views/items/_gallery.html.erb -
M
app/views/items/_toc.html.erb -
M
app/views/items/show.html.erb