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.

Thibaut Girka 980c004f06 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one		5 years ago
..
environments	…
initializers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
webpack	Revert CircleCI and some webpack changes to match upstream	5 years ago
application.rb	Fix uncaught query param encoding errors (#12741)	5 years ago
boot.rb	…
brakeman.ignore	…
database.yml	…
deploy.rb	…
environment.rb	…
i18n-tasks.yml	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
navigation.rb	…
pghero.yml	Use override_csp options on pghero (#12489)	5 years ago
puma.rb	…
routes.rb	Add bookmarks (#7107)	5 years ago
secrets.yml	…
settings.yml	Merge branch 'master' into glitch-soc/master	5 years ago
sidekiq.yml	…
webpacker.yml	…