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
..
_features.html.haml	…
_forms.html.haml	Improve styling of closed registrations message, rename button (#6695)	7 years ago
_links.html.haml	…
_registration.html.haml	…
more.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
show.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
terms.html.haml	Update /terms and /about/more to use public layout (#8142)	6 years ago