diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-18 18:22:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-18 18:22:54 +0200 |
| commit | 44e31c3e531e5c206003b7ed83ee1d6fdd3b2b53 (patch) | |
| tree | e9d1366c30b94df21ec767276fbde175428399fb /app/models/user.rb | |
| parent | 7423c0c1308555db3072ae64141250fdd33ce235 (diff) | |
| parent | bfeac6747a58b660f0d1b3766c7cfb3ea2655fce (diff) | |
Merge pull request #649 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/user.rb')
0 files changed, 0 insertions, 0 deletions