Mastodon

Files

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

Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb

Moved public.js changes to settings.js.

2018-12-09 16:08:04 +01:00

_theme.html.haml

…

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

2018-05-31 14:38:48 +02: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

2018-12-09 16:08:04 +01:00