Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb		2019-06-10 18:59:53 +02:00
..
admin.js	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +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	2019-06-10 18:59:53 +02:00
settings.js	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-04 14:53:52 +02:00
theme.yml	Fix CW fold/unfold in remote interaction dialog	2019-02-17 15:40:49 +01:00