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/environments
Thibaut Girka 00fcdebed7 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	db/migrate/20170716191202_add_hide_notifications_to_mute.rb
	spec/controllers/application_controller_spec.rb

Took our version, upstream changes were only minor style linting.
7 years ago
..
development.rb Upgrade Rails to version 5.2.0 (#5898) 8 years ago
production.rb Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
test.rb Misc. typos (#8694) 8 years ago