mastodon

mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00

History

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

Conflicts:
- `README.md`:
  We have a different README than upstream, discarded upstream changes
  and kept ours.

2020-04-12 16:50:27 +02:00

_theme.html.haml

Various fixes

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

admin.html.haml

2020-01-20 15:00:22 +01:00

application.html.haml

2019-06-10 18:59:53 +02:00

auth.html.haml

2019-06-10 18:59:53 +02:00

embedded.html.haml

2020-01-20 15:00:22 +01:00

error.html.haml

2019-02-17 13:34:40 +01:00

mailer.html.haml

2019-06-10 18:59:53 +02: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

2020-04-12 16:50:27 +02:00