comparison app/models/user.rb @ 373:c2230be27b7e live

Merge from branch "feature_128"
author Chris Cannam
date Fri, 01 Apr 2011 12:21:56 +0100
parents 440c4f4bf2d6
children 73ff0e6a11b1 b15397a5341c
comparison
equal deleted inserted replaced
370:055518fc4e4c 373:c2230be27b7e