]> cat aescling's git repositories - mastodon.git/commitdiff
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sat, 26 Jan 2019 17:32:49 +0000 (18:32 +0100)
committerThibaut Girka <thib@sitedethib.com>
Sat, 26 Jan 2019 17:32:49 +0000 (18:32 +0100)
1  2 
app/models/user.rb

Simple merge