You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/config
Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge
Conflicts:
	README.md
	app/controllers/statuses_controller.rb
	app/lib/feed_manager.rb
	config/navigation.rb
	spec/lib/feed_manager_spec.rb

Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit.
8 years ago
..
environments Merge remote-tracking branch 'origin/master' into gs-master 8 years ago
initializers Merge branch 'master' into glitch-soc/tentative-merge 8 years ago
locales Merge branch 'master' into glitch-soc/tentative-merge 8 years ago
webpack Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 8 years ago
application.rb Merge branch 'master' into glitch-soc/tentative-merge 8 years ago
boot.rb Upgrade Rails to version 5.2.0 (#5898) 8 years ago
brakeman.ignore Save video metadata and improve video OpenGraph tags (#6481) 8 years ago
database.yml
deploy.rb Update dependencies for Ruby (2018-04-23) (#7237) 8 years ago
environment.rb
i18n-tasks.yml Ignore tootsuite-specific theme-related translation strings 8 years ago
navigation.rb Merge branch 'master' into glitch-soc/tentative-merge 8 years ago
puma.rb
routes.rb Merge branch 'master' into glitch-soc/tentative-merge 8 years ago
secrets.yml
settings.yml Merge branch 'master' into glitch-soc/tentative-merge 8 years ago
sidekiq.yml Account archive download (#6460) 8 years ago
webpacker.yml