]> cat aescling's git repositories - mastodon.git/commit
Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sun, 7 Jul 2019 11:49:31 +0000 (13:49 +0200)
committerThibaut Girka <thib@sitedethib.com>
Sun, 7 Jul 2019 11:49:31 +0000 (13:49 +0200)
commit7039dca12cf926fecbb2eb4fbba1461af5cb91c2
treee530d7d18cd36177015c3fc840aaea68a6d723fa
parent47c30be8d810fd6d5d27285a097d01843f4dd9f6
parentc07cca4727041ea5a5721acbc603d4bfb45a15a6
Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream

Unlike upstream, kept the direct timeline endpoint, as it is still of use in
glitch-soc.
app/controllers/api/v1/statuses_controller.rb
app/javascript/mastodon/features/compose/components/compose_form.js
config/routes.rb