mastodon

mirror of https://github.com/mastodon/mastodon.git synced 2025-02-01 23:11:41 +01:00

History

Thibaut Girka b481e4fac1 Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
	config/locales/simple_form.ja.yml

2018-05-19 22:41:10 +02:00

_theme.html.haml

Various fixes

2017-12-04 21:58:10 -08:00

admin.html.haml

2017-11-20 22:13:37 -08:00

application.html.haml

2018-03-11 09:17:21 +00:00

auth.html.haml

2018-02-23 23:28:31 +09:00

embedded.html.haml

Minor fixes

2017-11-21 18:17:38 -08:00

error.html.haml

2017-11-20 22:13:37 -08:00

mailer.html.haml

2018-01-28 22:45:17 -06:00

mailer.text.erb

2018-01-18 19:17:25 +01:00

modal.html.haml

2018-02-23 23:28:31 +09:00

plain_mailer.html.haml

2018-01-16 03:29:11 +01:00

public.html.haml

2018-05-19 22:41:10 +02:00