]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sun, 13 Jan 2019 13:41:06 +0000 (14:41 +0100)
committerThibaut Girka <thib@sitedethib.com>
Sun, 13 Jan 2019 13:41:06 +0000 (14:41 +0100)
commiteff1c94744609b432c8dba8a35cd97e9a20ce652
treee173621ead4c940b201d419971c291530d575103
parent2cfa55185a5fc7d93a160a4e9a4730aae6725b0f
parent4fb94c758e3bf2e1c0525e9075c2d5dedc14c666
Merge branch 'master' into glitch-soc/merge-upstream
Gemfile.lock
app/helpers/application_helper.rb
app/javascript/packs/public.js
app/javascript/styles/mastodon/admin.scss
app/views/stream_entries/_detailed_status.html.haml
app/views/stream_entries/_simple_status.html.haml