diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-10-16 01:29:02 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-10-16 01:29:02 -0500 |
| commit | 6cd5b3bbe5a11fcf25bbefba2803f2ae840f39fc (patch) | |
| tree | 4bb60f4493fb70cada728a373f74c18b87e8f95d /app/models/user.rb | |
| parent | f72ad67a3967230afd63a9e2d84a2a69331c4787 (diff) | |
| parent | 894da3dcca781e27ce9c5130f1021526ac8a6887 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Diffstat (limited to 'app/models/user.rb')
0 files changed, 0 insertions, 0 deletions