comparison app/models/user.rb @ 379:f25c73364bfb cannam-pre-20110113-merge

Merge from branch "feature_121"
author Chris Cannam
date Mon, 04 Apr 2011 10:29:54 +0100
parents 440c4f4bf2d6
children 73ff0e6a11b1 b15397a5341c
comparison
equal deleted inserted replaced
375:773777b12fa1 379:f25c73364bfb