about summary refs log tree commit diff
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-09-20 18:36:00 +0200
committerThibaut Girka <thib@sitedethib.com>2018-09-20 18:36:00 +0200
commit343acd96cccb16b1ecdc3a52a8733359d4a92633 (patch)
treeecd2a077b038b864ac7912cba72dd59990fb6258 /app/models/user.rb
parentfba0200765c14d0ada47a44b5a8603001c92e069 (diff)
parent50c90a909e400628febd53c805165f1da5ecbfbd (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/models/user.rb')
0 files changed, 0 insertions, 0 deletions