Thibaut Girka a01674fb2b Merge branch 'master' into glitch-soc/merge-upstream		2020-06-26 13:02:14 +02:00
..
environments
initializers	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-17 17:10:15 +02:00
locales	Fix various issues around OpenGraph representation of media (#14133)	2020-06-25 01:33:01 +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	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-24 14:37:06 +01:00
pghero.yml	Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595)	2020-05-04 13:52:41 +02:00
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