diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-12-01 12:12:42 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-12-01 12:12:42 +0100 |
commit | 99f1f48741865fd5cb510930488d36af27a5d24d (patch) | |
tree | 1abd8eed33721830f7757a5d5ba85ffbd3b1012a /spec/models/user_spec.rb | |
parent | 7f6315841c98a1eee6cb57171a91a88f5c5343df (diff) | |
parent | d70268f0991ba69568112d4da5768e821d5983dd (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'spec/models/user_spec.rb')
0 files changed, 0 insertions, 0 deletions