comparison app/models/user.rb @ 959:910830dc222a cannam

Merge from branch "bug_521"
author Chris Cannam
date Tue, 16 Oct 2012 15:37:03 +0100
parents ec1c49528f36
children bb32da3bea34
comparison
equal deleted inserted replaced
956:fa2a1b6cda26 959:910830dc222a