diff options
| author | ThibG <thib@sitedethib.com> | 2020-12-19 02:17:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-19 02:17:02 +0100 |
| commit | 79c57810b7fea1962c9746d74c90235ad4e3e899 (patch) | |
| tree | 6ec332dd20fa4ce8de954d8e260cce3f2dc67aee /app/models/user.rb | |
| parent | 92cfcf168cae094ece281b3cb6d0f5b1539a8c25 (diff) | |
| parent | 5c966bef8b6aa116cfa2102e83e42d0fe421f3fc (diff) | |
Merge pull request #1477 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/user.rb')
0 files changed, 0 insertions, 0 deletions