diff app/controllers/users_controller.rb @ 1426:7367cd232b1e luisf

Merge.
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Mon, 07 Oct 2013 15:42:39 +0100
parents 96790506f247
children 4f746d8966dd 51364c0cd58f
line wrap: on
line diff