diff app/models/user_preference.rb @ 958:352539ac7b43 live

Merge from branch "bug_521"
author Chris Cannam
date Tue, 16 Oct 2012 15:36:12 +0100
parents 5f33065ddc4b
children 433d4f72a19b
line wrap: on
line diff