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
..
actions	[Glitch] Fix 404 and 410 API errors being silently discarded in WebUI	2020-04-02 20:39:44 +02:00
components	[Glitch] Improve polls: option lengths & redesign	2020-04-02 20:52:53 +02:00
containers	[Glitch] Change the string "hidden" to "blocked" in WebUI	2020-03-22 16:29:51 +01:00
features	[Glitch] Add explanation as to why unlocked accounts may have follow requests	2020-04-04 21:59:49 +02:00
images
locales
middleware	[Glitch] Fix 404 and 410 API errors being silently discarded in WebUI	2020-04-02 20:39:44 +02:00
packs	Merge branch 'master' into glitch-soc/merge-upstream	2020-04-05 18:32:06 +02:00
reducers	[Glitch] Fix content warning being unnecessarily cleared when enabling/disabling CW	2020-04-02 20:45:46 +02:00
selectors
store
styles	[Glitch] Add explanation as to why unlocked accounts may have follow requests	2020-04-04 21:59:49 +02:00
util	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-22 16:10:44 +01:00
names.yml
theme.yml