mastodon/app
Thibaut Girka 4aa6aba6ee Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/services/remove_status_service.rb
  Conflict because we still handle the direct timeline.
  Took upstream changes, with that one extra function call.
- config/locales/ca.yml
  Conflict because theme names were updated.
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.
- config/locales/oc.yml
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.
- config/locales/pl.yml
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.
2019-03-16 20:59:33 +01:00
..
chewy
controllers Fix relationships controller/view wrt. glitch-soc theming engine 2019-03-16 14:26:14 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 14:14:20 +01:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 20:59:33 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 14:14:20 +01:00
mailers Fix error in AdminMailer#new_pending_account (#10264) 2019-03-14 14:20:22 +01:00
models Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 14:14:20 +01:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2019-03-14 17:17:20 +01:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2019-03-14 17:17:20 +01:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 14:14:20 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 20:59:33 +01:00
validators
views Fix settings/flavours 2019-03-16 16:21:20 +01:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 20:59:33 +01:00