Mastodon

History

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

2019-09-30 12:23:57 +02:00

_theme.html.haml

Various fixes

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

admin.html.haml

2019-09-30 12:23:57 +02: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

2018-10-22 17:51:38 +02: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

2019-08-19 21:49:35 +02:00