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 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		5 years ago
..
_theme.html.haml	…
admin.html.haml	…
application.html.haml	…
auth.html.haml	…
embedded.html.haml	…
error.html.haml	…
mailer.html.haml	…
mailer.text.erb	…
modal.html.haml	…
plain_mailer.html.haml	…
public.html.haml	…