diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-12-06 12:44:38 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-12-06 12:44:38 +0100 |
| commit | 1df392819d544e62ae9f685020e462c960d31635 (patch) | |
| tree | e43bc3a7addbcc044979dbbc1cb44a86d4502efc /app/models/user.rb | |
| parent | fe9340d95e9ae9a1870e9951e9b00ad5df4cc257 (diff) | |
| parent | 155cf126807ab25da4d0e5da55b2d598c981e2ab (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/models/user.rb')
0 files changed, 0 insertions, 0 deletions