diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-28 20:36:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-28 20:36:55 +0100 |
| commit | 7f22ed0fc912ffbd94e0df4e0d40750dae542b97 (patch) | |
| tree | 770029d865518400da31e9cdb55fc9c584e5a90b /app/models/user.rb | |
| parent | ee1f1a2ec97604ed364a5944bd300be0771ba7d7 (diff) | |
| parent | b00f60f1d3d5415b5fd536191a7ee183ae910d03 (diff) | |
Merge pull request #794 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/user.rb')
0 files changed, 0 insertions, 0 deletions