Thibaut Girka 59e92004b3 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `Gemfile.lock`: not a real conflict, upstream update too close
  to a glitch-soc-specific dependency

2020-06-17 17:10:15 +02:00

..

environments

…

initializers

Merge branch 'master' into glitch-soc/merge-upstream

2020-06-17 17:10:15 +02:00

locales

Improve wording and add titles on moderated servers section in /about/more (#13930)

2020-06-09 10:28:02 +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

…

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

Disable E2EE-related routes

2020-06-09 11:16:42 +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

…