mastodon

mirror of https://github.com/mastodon/mastodon.git synced 2025-01-18 16:11:42 +01:00

History

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

Conflicts:
- app/views/admin/settings/edit.html.haml:
  Conflict due to how the theming settings change.

2019-03-14 17:17:20 +01:00

_theme.html.haml

Various fixes

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

admin.html.haml

2018-10-26 20:41:43 +02:00

application.html.haml

2018-10-11 14:12:36 +02:00

auth.html.haml

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

embedded.html.haml

2018-10-22 17:51:38 +02:00

error.html.haml

2019-02-17 13:34:40 +01: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-09-28 02:11:14 +02:00

plain_mailer.html.haml

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

public.html.haml

2019-03-14 17:17:20 +01:00