diff app/controllers/application_controller.rb @ 431:d3af621ba9d4 bug_168

Update the master branch via git pull master rather than git fetch (which doesn't merge any particular branch)
author Chris Cannam
date Sun, 05 Jun 2011 10:28:27 +0100
parents 7d8567890fa3
children 350acce374a2 dff13616e464
line wrap: on
line diff