]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sat, 25 Jan 2020 09:04:41 +0000 (10:04 +0100)
committerThibaut Girka <thib@sitedethib.com>
Sat, 25 Jan 2020 09:04:41 +0000 (10:04 +0100)
commit61f699c0e907d8525190b115fc619296b4affa98
tree9ed5cc5b4260565bebab4482b3266b911204fa79
parent0be67df4f0a64367d9e376b06bd3fd2fb9ca8195
parentf816da9c6474ddf437681fbf7f5346672436ccdf
Merge branch 'master' into glitch-soc/merge-upstream
app/javascript/styles/mastodon/components.scss
app/models/user.rb
config/locales/en.yml
streaming/index.js