Thibaut Girka 9101254d0a Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/javascript/packs/public.js`:
  Upstream modified code that we split between multiple files due
  to glitch-soc's theming system.
  Ported those changes.

2020-04-05 18:32:06 +02:00

..

admin.js

Merge branch 'master' into glitch-soc/merge-upstream

2020-04-04 21:47:37 +02:00

common.js

Avoid loading rails-ujs twice on vanilla flavour

2018-07-16 16:42:52 +02:00

embed.js

Finalized theme loading and stuff

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

mailer.js

Fixed improper mailer import

2018-01-15 21:23:26 -08:00

public.js

Merge branch 'master' into glitch-soc/merge-upstream

2020-04-05 18:32:06 +02:00

settings.js

Merge branch 'master' into glitch-soc/merge-upstream

2020-03-22 16:10:44 +01:00

theme.yml

Include necessary JS in auth pages

2019-06-13 22:38:22 +02:00