Changeset [890117c46cfef20c88cb38c9dea6138addae2778] by Kalin Harvey
Revision 890117c46cfef20c88cb38c9dea6138addae2778,
committed by Kalin Harvey
· January 11th, 2010 @ 09:16 PM
Merge branch 'master' of heroku.com:gbb
- 'master' of heroku.com:gbb: 'attempting to fix some js stuff by pushing to teh server'
Conflicts:
app/views/map/index.html.erb
http://github.com/greenbuilding/greenbuildingbrain/commit/890117c46...
2 changed files
-
M
app/views/map/index.html.erb -
M
public/stylesheets/widget.css