Mercurial > hg > soundsoftware-site
diff app/models/role.rb @ 816:f3c3a1c55451 luisf
Merge from branch "live"
author | luisf <luis.figueira@eecs.qmul.ac.uk> |
---|---|
date | Wed, 23 Nov 2011 16:10:31 +0000 |
parents | cbce1fd3b1b7 |
children | cbb26bc654de |
author | luisf <luis.figueira@eecs.qmul.ac.uk> |
---|---|
date | Wed, 23 Nov 2011 16:10:31 +0000 |
parents | cbce1fd3b1b7 |
children | cbb26bc654de |