]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Mon, 10 Jun 2019 18:09:05 +0000 (20:09 +0200)
committerThibaut Girka <thib@sitedethib.com>
Mon, 10 Jun 2019 18:09:05 +0000 (20:09 +0200)
commit7778de467cd35fa4a514dd97ced0d19675f3b9d9
treec8048db1bc718663c5ed33c8b225544d5e37f98b
parentfc6d27daf39ca136b0e3e09e7572c5c46086ad72
parent5bcd98172c2d0ec4827e396a3648eb1e94634c55
Merge branch 'master' into glitch-soc/merge-upstream
app/views/settings/preferences/other/show.html.haml