Thibaut Girka e87bd6d94a Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md Kept our version - app/javascript/mastodon/features/compose/components/compose_form.js Two changes too close to each other, took both changes		2019-02-01 16:12:20 +01:00
..
environments
initializers	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-19 18:28:37 +01:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-01 16:12:20 +01:00
webpack	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-02 15:36:53 +01:00
application.rb
boot.rb	Fix bootsnap cache directory being declared relatively (#9511)	2018-12-13 05:19:52 +01:00
brakeman.ignore
database.yml	Remove PostgreSQL statement timeout (#9537)	2018-12-16 21:17:15 +01:00
deploy.rb	Use the bundled Capistrano version (#9855)	2019-01-18 21:31:11 +01:00
environment.rb
i18n-tasks.yml
navigation.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
puma.rb
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
secrets.yml
settings.yml	Make storing and displaying application used to toot opt-in	2019-01-27 13:56:41 +01:00
sidekiq.yml	Add scheduled statuses (#9706)	2019-01-05 12:43:28 +01:00
webpacker.yml