diff options
| author | ThibG <thib@sitedethib.com> | 2019-11-24 00:36:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-24 00:36:35 +0100 |
| commit | 2448568d341dcf288bf004826666ab9010601b47 (patch) | |
| tree | 2df762b1b6d46f64f97991a70267d96a4509cdd1 /app/models/user.rb | |
| parent | 55f5e81a9dc4c6cede5d43e549061be2ea9be614 (diff) | |
| parent | 271b2e68f33e8086eb4a1ee44694fcd2ecd7ab07 (diff) | |
Merge pull request #1247 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/user.rb')
0 files changed, 0 insertions, 0 deletions