comparison app/models/user.rb @ 1440:7465cceb8dfc

Merge from live branch
author Chris Cannam
date Fri, 11 Oct 2013 09:34:09 +0100
parents bb32da3bea34
children 4f746d8966dd 51364c0cd58f
comparison
equal deleted inserted replaced
1431:303b9be118d4 1440:7465cceb8dfc