diff app/controllers/settings_controller.rb @ 704:b1fa2f0ac9d8 live

Merge from branch feature_36
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Mon, 19 Sep 2011 17:03:29 +0100
parents cbce1fd3b1b7
children 433d4f72a19b
line wrap: on
line diff