mastodon/config
Thibaut Girka 9c3b9d5ab9 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.env.production.sample`:
  Upstream deleted it, I decided to keep it.
- `package.json`:
  Upstream updated a dependency textually too close to wavesurfer.js
  which has been deleted from upstream but is kept in glitch-soc for now.
2020-06-30 23:00:20 +02:00
..
environments
initializers Merge branch 'master' into glitch-soc/merge-upstream 2020-06-30 23:00:20 +02:00
locales Add user notes on accounts (#14148) 2020-06-30 19:19:50 +02:00
locales-glitch Add support for setting Content Warning for CW-less outgoing toots 2020-05-30 18:27:00 +02:00
webpack Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
application.rb Fix sr locale being selected over sr-Latn (#13693) 2020-05-11 01:09:21 +02:00
boot.rb
brakeman.ignore Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
database.yml
deploy.rb Bump capistrano from 3.14.0 to 3.14.1 (#14037) 2020-06-17 06:31:30 +02:00
environment.rb
i18n-tasks.yml
navigation.rb
pghero.yml
puma.rb
routes.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-06-30 23:00:20 +02:00
secrets.yml
settings.yml Add support for setting Content Warning for CW-less outgoing toots 2020-05-30 18:27:00 +02:00
sidekiq.yml
webpacker.yml