]> cat aescling's git repositories - mastodon.git/commit
Merge upstream 2.0ish #165
authorkibigo! <marrus-sh@users.noreply.github.com>
Wed, 11 Oct 2017 17:43:10 +0000 (10:43 -0700)
committerkibigo! <marrus-sh@users.noreply.github.com>
Wed, 11 Oct 2017 17:43:10 +0000 (10:43 -0700)
commit8d6b9ba4946b5b159af0fbd130637a226a286796
tree9def26711682d29338cfa1b081822029a01669eb
parentf0a2a6c875e9294f0ea1d4c6bc90529e41a2dc37
parent476e79b8e340c9103352a0799e102e4aca1a5593
Merge upstream 2.0ish #165
44 files changed:
app/javascript/mastodon/actions/compose.js
app/javascript/mastodon/components/column_header.js
app/javascript/mastodon/components/media_gallery.js
app/javascript/mastodon/components/status.js
app/javascript/mastodon/components/status_content.js
app/javascript/mastodon/components/status_list.js
app/javascript/mastodon/containers/mastodon.js
app/javascript/mastodon/features/compose/components/compose_form.js
app/javascript/mastodon/features/compose/components/search_results.js
app/javascript/mastodon/features/compose/index.js
app/javascript/mastodon/features/home_timeline/index.js
app/javascript/mastodon/features/notifications/components/notification.js
app/javascript/mastodon/features/notifications/containers/notification_container.js
app/javascript/mastodon/features/notifications/index.js
app/javascript/mastodon/features/status/components/detailed_status.js
app/javascript/mastodon/features/status/index.js
app/javascript/mastodon/features/ui/components/column_link.js
app/javascript/mastodon/features/ui/components/modal_root.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/compose.js
app/javascript/mastodon/reducers/notifications.js
app/javascript/mastodon/reducers/settings.js
app/javascript/packs/public.js
app/javascript/styles/accounts.scss
app/javascript/styles/components.scss
app/lib/feed_manager.rb
app/lib/user_settings_decorator.rb
app/models/account.rb
app/models/media_attachment.rb
app/models/mute.rb
app/models/status.rb
app/models/stream_entry.rb
app/services/mute_service.rb
app/views/about/more.html.haml
app/views/about/show.html.haml
app/views/layouts/error.html.haml
config/application.rb
config/environments/production.rb
config/routes.rb
config/webpack/loaders/babel.js
config/webpack/shared.js
db/schema.rb
This page took 0.063339 seconds and 3 git commands to generate.