Changeset [ff557f48c1dfc71982a81cd1c6e7219fe7219902] by Alex Grunenfelder
Revision ff557f48c1dfc71982a81cd1c6e7219fe7219902,
committed by Alex Grunenfelder
· March 9th, 2010 @ 03:53 PM
Merge branch 'master' of git://github.com/greenbuilding/greenbuildingbrain into dcs_portal
- 'master' of git://github.com/greenbuilding/greenbuildingbrain: search now can be limited to specific types of results just whitespace changed the audiotours to include outros and stuff added map, but then it was trouble, so i removed it podcast link
Conflicts:
app/views/tours/show.widget.erb
http://github.com/greenbuilding/greenbuildingbrain/commit/ff557f48c...
5 changed files
-
M
app/controllers/items_controller.rb -
M
app/views/audiofiles/listen.xml.erb -
M
app/views/items/index.html.erb -
M
app/views/tours/show.html.erb -
M
app/views/tours/show.widget.erb