]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Mon, 30 Sep 2019 10:23:57 +0000 (12:23 +0200)
committerThibaut Girka <thib@sitedethib.com>
Mon, 30 Sep 2019 10:23:57 +0000 (12:23 +0200)
commit16ff7c5627c12a0c9658e9d2fac7c48002e1b788
tree465a73fb9f42bc2b01127b2d477b0715fb6185b4
parentfebcdad2e2c98aee62b55ee21bdf0debf7c6fd6b
parent3babf8464b0903b854ec16d355909444ef3ca0bc
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
43 files changed:
.env.production.sample
Gemfile
Gemfile.lock
app/controllers/about_controller.rb
app/controllers/accounts_controller.rb
app/controllers/api/v2/search_controller.rb
app/controllers/auth/sessions_controller.rb
app/controllers/directories_controller.rb
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
app/controllers/remote_follow_controller.rb
app/controllers/remote_interaction_controller.rb
app/controllers/statuses_controller.rb
app/controllers/tags_controller.rb
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
app/javascript/packs/public.js
app/javascript/styles/mastodon/admin.scss
app/javascript/styles/mastodon/components.scss
app/models/concerns/account_associations.rb
app/models/status.rb
app/models/user.rb
app/presenters/instance_presenter.rb
app/serializers/activitypub/note_serializer.rb
app/services/post_status_service.rb
app/views/about/more.html.haml
app/views/admin/dashboard/index.html.haml
app/views/admin/tags/index.html.haml
app/views/layouts/admin.html.haml
app/views/settings/profiles/show.html.haml
config/locales/en.yml
config/locales/ja.yml
config/locales/pl.yml
config/locales/simple_form.en.yml
config/locales/simple_form.ja.yml
config/navigation.rb
config/routes.rb
db/schema.rb
lib/mastodon/version.rb
package.json
yarn.lock