You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js		6 years ago
..
core	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
flavours	Fix thread CW expansion not being reset when changing threads	6 years ago
fonts	Theme: Windows 95	6 years ago
images	Merge branch 'master' into glitch-soc/tentative-merge	6 years ago
locales	Javascript intl8n flavour support	7 years ago
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
packs	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
skins	Port Sylvhem's mastodon-light to glitch flavour	6 years ago
styles	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago