]> cat aescling's git repositories - mastodon.git/commit
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
authorOndřej Hruška <ondra@ondrovo.com>
Thu, 28 Sep 2017 07:12:17 +0000 (09:12 +0200)
committerOndřej Hruška <ondra@ondrovo.com>
Thu, 28 Sep 2017 07:12:17 +0000 (09:12 +0200)
commit9330ea1f4d34b6ef4ce6e841f1aa931a7f10f749
tree81e346b3d9ca532b3d252135d82ce20f61780a36
parent06e299cef591b63bd96f320eadc873b047cd2664
parent4aea3f88a6d30f102a79c2da7fcfac96465ba1a8
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
23 files changed:
app/controllers/home_controller.rb
app/javascript/mastodon/components/media_gallery.js
app/javascript/mastodon/components/status.js
app/javascript/mastodon/containers/status_container.js
app/javascript/mastodon/features/status/components/detailed_status.js
app/javascript/mastodon/features/ui/index.js
app/javascript/mastodon/features/ui/util/async-components.js
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/reducers/index.js
app/javascript/packs/public.js
app/javascript/styles/components.scss
app/javascript/styles/stream_entries.scss
app/models/account.rb
app/presenters/instance_presenter.rb
app/services/post_status_service.rb
app/views/about/more.html.haml
app/views/about/show.html.haml
app/views/accounts/_header.html.haml
app/views/settings/profiles/show.html.haml
config/application.rb
config/routes.rb
db/schema.rb
spec/views/about/show.html.haml_spec.rb
This page took 0.05031 seconds and 3 git commands to generate.