You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Yip 3550470c18 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json The above conflicts appear to be a text conflict introduced by glitch-soc's additional level of columns (i.e. moving a bunch of columns under the Misc option). They were resolved via accept-ours.		7 years ago
..
environments	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
initializers	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
locales	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
webpack	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
application.rb	Merge branch 'master' into glitch-soc/merge	7 years ago
boot.rb	Upgrade Rails to version 5.2.0 (#5898)	7 years ago
brakeman.ignore	…
database.yml	…
deploy.rb	Update dependencies for Ruby (2018-04-23) (#7237)	7 years ago
environment.rb	…
i18n-tasks.yml	Ignore tootsuite-specific theme-related translation strings	7 years ago
navigation.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
puma.rb	…
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
secrets.yml	…
settings.yml	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
sidekiq.yml	…
webpacker.yml	…