Thibaut Girka f5f6d23d55 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.		2019-04-08 15:57:56 +02:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-04 14:53:52 +02:00
flavours	Merge pull request #981 from ThibG/glitch-soc/merge-upstream	2019-04-04 15:13:18 +02:00
fonts	Theme: Windows 95	2018-01-05 16:22:58 -08:00
images	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-20 13:54:00 +01:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-01 21:00:16 +01:00
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-08 15:57:56 +02:00
packs	Hopefully fix input text selection quirks on iOS (#10463)	2019-04-03 17:54:54 +02:00
skins	Port Sylvhem's mastodon-light to glitch flavour	2018-05-07 17:00:02 +02:00
styles	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-08 15:57:56 +02:00