comparison app/models/user.rb @ 340:b9d158e46acb live

Merge
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Thu, 31 Mar 2011 10:37:19 +0100
parents 440c4f4bf2d6
children 73ff0e6a11b1 b15397a5341c
comparison
equal deleted inserted replaced
338:89b3acb833d1 340:b9d158e46acb