]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sat, 4 Jan 2020 21:54:06 +0000 (22:54 +0100)
committerThibaut Girka <thib@sitedethib.com>
Sat, 4 Jan 2020 22:04:42 +0000 (23:04 +0100)
commit01eaeab56df4da4c697b1096f40a400cc9e2b8e8
tree6288ee106b4615cacd98362f9fd268317a9cdeff
parent22daf24600d8e99e4569740ee5836d25c70c1e8b
parent2ecc7802caf4d272191a7fd582fc97996f750827
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/application_controller.rb`:
  Conflict due to theming system.
- `app/controllers/oauth/authorizations_controller.rb`:
  Conflict due to theming system.
21 files changed:
Gemfile
Gemfile.lock
app/controllers/application_controller.rb
app/controllers/auth/registrations_controller.rb
app/controllers/filters_controller.rb
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
app/controllers/oauth/authorizations_controller.rb
app/controllers/settings/base_controller.rb
app/helpers/accounts_helper.rb
app/javascript/styles/mastodon/components.scss
app/models/account.rb
app/models/media_attachment.rb
app/serializers/rest/account_serializer.rb
app/services/backup_service.rb
app/services/process_mentions_service.rb
app/views/admin/tags/index.html.haml
app/views/settings/preferences/appearance/show.html.haml
config/locales/en.yml
package.json
yarn.lock