diff app/models/user.rb @ 714:1ea217fdcdbf feature_36_js_refactoring

Merge from branch "feature_36"
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Wed, 28 Sep 2011 16:41:30 +0100
parents ec7c78040115
children 5e80956cc792
line wrap: on
line diff