]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sun, 1 Dec 2019 11:12:42 +0000 (12:12 +0100)
committerThibaut Girka <thib@sitedethib.com>
Sun, 1 Dec 2019 11:12:42 +0000 (12:12 +0100)
commit99f1f48741865fd5cb510930488d36af27a5d24d
tree1abd8eed33721830f7757a5d5ba85ffbd3b1012a
parent7f6315841c98a1eee6cb57171a91a88f5c5343df
parentd70268f0991ba69568112d4da5768e821d5983dd
Merge branch 'master' into glitch-soc/merge-upstream
.env.production.sample
app/javascript/styles/mastodon/components.scss
app/views/relationships/show.html.haml
config/locales/en.yml