Thibaut Girka 1c6c40d17c Merge branch 'master' into glitch-soc/merge-upstream		2020-07-16 14:43:50 +02:00
..
environments	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-15 15:32:40 +02:00
initializers	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-07 15:58:45 +02:00
locales	New Crowdin updates (#14314)	2020-07-16 00:49:14 +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	Add color extraction for audio thumbnails (#14209)	2020-07-05 18:28:25 +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	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-01 19:23:14 +02:00
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	Add PERSISTENT_TIMEOUT option (#11756)	2019-09-04 20:44:08 +02:00
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-15 15:32:40 +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