diff options
| author | nfoy <nfoy@purdue.edu> | 2014-04-06 20:04:41 -0400 |
|---|---|---|
| committer | nfoy <nfoy@purdue.edu> | 2014-04-06 20:04:41 -0400 |
| commit | b805844f27b13d669a1bc98c79d656f2a7c601db (patch) | |
| tree | 03d245fc8d4221480c613ade54135b5017e31b92 /app/models/user.rb | |
| parent | e7bf049624246a1248d09c571db31ef26260ae08 (diff) | |
| parent | e02fb83cdc7a971691cebf031eb35efd6665833b (diff) | |
Merge branch 'clean2'
Diffstat (limited to 'app/models/user.rb')
0 files changed, 0 insertions, 0 deletions