diff options
| author | ThibG <thib@sitedethib.com> | 2019-01-25 22:42:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-25 22:42:21 +0100 |
| commit | 270bf7778d681453b259e54b5da55fb449365c8b (patch) | |
| tree | f94f595aa4347572fe7a62488c8bc90d56f94d2f /app/models/user.rb | |
| parent | afec6b43eb856547ccc7083dbb677096d78821bf (diff) | |
| parent | 8ef0498f1ca4ff4dab7d8255f15577a86907c392 (diff) | |
Merge pull request #896 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/user.rb')
0 files changed, 0 insertions, 0 deletions