]> cat aescling's git repositories - mastodon.git/commit
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
authorOndřej Hruška <ondra@ondrovo.com>
Thu, 28 Sep 2017 07:18:35 +0000 (09:18 +0200)
committerOndřej Hruška <ondra@ondrovo.com>
Thu, 28 Sep 2017 07:18:35 +0000 (09:18 +0200)
commit83bda6c1a813c5aeb131b18a0500fed0c07fa9c2
tree32f197901b4b16ea7f94de682fee6cdc44686045
parentfcf0d2078ea813e0dd318fa154d620018e7b7bcf
parentb9f59ebcc68e9da0a7158741a1a2ef3564e1321e
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
26 files changed:
app/javascript/mastodon/actions/compose.js
app/javascript/mastodon/components/account.js
app/javascript/mastodon/components/media_gallery.js
app/javascript/mastodon/components/status.js
app/javascript/mastodon/components/status_action_bar.js
app/javascript/mastodon/features/account/components/header.js
app/javascript/mastodon/features/account_timeline/components/header.js
app/javascript/mastodon/features/account_timeline/containers/header_container.js
app/javascript/mastodon/features/compose/components/compose_form.js
app/javascript/mastodon/features/status/components/action_bar.js
app/javascript/mastodon/features/status/index.js
app/javascript/mastodon/features/ui/index.js
app/javascript/mastodon/features/ui/util/async-components.js
app/javascript/mastodon/is_mobile.js
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/reducers/compose.js
app/javascript/mastodon/reducers/index.js
app/javascript/styles/application.scss
app/javascript/styles/components.scss
app/models/account.rb
app/views/layouts/application.html.haml
app/views/stream_entries/_detailed_status.html.haml
app/views/stream_entries/_simple_status.html.haml
config/routes.rb
db/schema.rb
public/500.html
This page took 0.049557 seconds and 3 git commands to generate.