This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/views/layouts
Thibaut Girka cd99255698 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
	app/controllers/oauth/authorizations_controller.rb

Just two changes being too close to one another.
Took both.
2018-09-11 16:51:26 +02:00
..
_theme.html.haml
admin.html.haml
application.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2018-08-26 14:23:24 +02:00
auth.html.haml
embedded.html.haml
error.html.haml
mailer.html.haml
mailer.text.erb
modal.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2018-09-11 16:51:26 +02:00
plain_mailer.html.haml
public.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2018-08-24 15:10:34 +02:00