]> cat aescling's git repositories - mastodon.git/commit
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)
commit80d954ec10b7e1e080af2ab5d1ea6b0b40675164
tree21811e1d2e969ba90de2714de5abfc7aaf391ea1
parent270bf7778d681453b259e54b5da55fb449365c8b
parent9519d55332a1f22891e5ad8a1de1d2ba027bafc7
Merge branch 'master' into glitch-soc/merge-upstream
app/models/user.rb