Changeset [19fa13895b985cbdb3ed478f12fed448fd2d5907] by Kalin Harvey
Revision 19fa13895b985cbdb3ed478f12fed448fd2d5907,
committed by Kalin Harvey
· May 6th, 2009 @ 04:30 PM
Merge branch 'master' of git://github.com/graemeworthy/greenbuildingbrain into graeme
- 'master' of git://github.com/graemeworthy/greenbuildingbrain: homepage controller redirect the facebox can show images too
Conflicts:
app/controllers/items_controller.rb
app/views/items/_gallery.html.erb
8 changed files
-
M
app/controllers/items_controller.rb -
M
app/controllers/pictures_controller.rb -
M
app/models/picture.rb -
M
app/views/items/_gallery.html.erb -
M
app/views/pictures/index.html.erb -
M
config/routes.rb -
M
spec/controllers/homepage_controller_spec.rb -
M
spec/controllers/sessions_controller_spec.rb