]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sun, 19 May 2019 19:53:44 +0000 (21:53 +0200)
committerThibaut Girka <thib@sitedethib.com>
Sun, 19 May 2019 19:53:44 +0000 (21:53 +0200)
1  2 
app/models/user.rb

Simple merge