Changeset [9a3d6c63a2ba87060e4a7d7f6e08f96a001d802a] by Kalin Harvey
Revision 9a3d6c63a2ba87060e4a7d7f6e08f96a001d802a,
committed by Kalin Harvey
· May 20th, 2009 @ 07:26 PM
Merge branch 'master' of git://github.com/graemeworthy/greenbuildingbrain into map
- 'master' of git://github.com/graemeworthy/greenbuildingbrain: fixed the tables
Conflicts:
app/views/items/_stats.html.erb
3 changed files
-
M
app/controllers/map_controller.rb -
M
app/views/items/_stats.html.erb -
M
app/views/map/index.html.erb