diff options
| author | ThibG <thib@sitedethib.com> | 2019-05-24 16:30:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-24 16:30:49 +0200 |
| commit | fd0487c04fbcbc89fb351b156999a6dc3a99d68b (patch) | |
| tree | e4d2533bdb3ff0e3a6a30b26eb1268a312ddb4f3 /app/models/user.rb | |
| parent | 72bf354e979a9b8c14c41bf34c47060d5ff4d232 (diff) | |
| parent | 7fb76999af8a14bb1761eebcf23b65f51067054f (diff) | |
Merge pull request #1068 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/user.rb')
0 files changed, 0 insertions, 0 deletions