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 e5a603206d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/accounts_controller.rb app/javascript/mastodon/locales/pl.json app/views/about/more.html.haml Conflicts in `accounts_controller.rb` resolved by taking upstream's version + our `use_pack`. Conflicts in `pl.json` resolved by taking upstream's changes. Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.		6 years ago
..
controllers	…
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
features	…
fixtures	…
helpers	…
lib	…
mailers	…
models	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
policies	…
presenters	…
requests	…
routing	…
services	…
support	…
validators	…
views	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
workers	…
rails_helper.rb	…
spec_helper.rb	…