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 f26f1145ac Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x		6 years ago
..
core	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
flavours	Add an option restricting secondary toot privacy to that of the toot being replied to	6 years ago
fonts	Theme: Windows 95	7 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