comparison app/models/user.rb @ 264:7b74f431bdab live

Merge from branch "feature_80"
author Chris Cannam
date Fri, 04 Mar 2011 16:04:10 +0000
parents 440c4f4bf2d6
children 73ff0e6a11b1 b15397a5341c
comparison
equal deleted inserted replaced
262:f936ec3cb58a 264:7b74f431bdab