diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-11-27 15:10:58 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-11-27 15:10:58 +0100 |
| commit | 55edfd6e0e1cb5377f0c3406d94ddfd84ddb7b20 (patch) | |
| tree | 0f9f6e40e40f4ecabfa1e5f906000abe756f42a9 /app/models/user.rb | |
| parent | f969eca07e2ac7b601694c463ef7097b787bbf65 (diff) | |
| parent | 637d0ed8380442e95696e0b9769ba304afb22cd5 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/models/user.rb')
0 files changed, 0 insertions, 0 deletions