Thibaut Girka 534439e73b Add focal points support in the composer		2018-08-18 17:53:20 +02:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-17 17:43:54 +02:00
flavours	Add focal points support in the composer	2018-08-18 17:53:20 +02:00
fonts
images	Merge branch 'master' into glitch-soc/tentative-merge	2018-07-09 07:13:59 +02:00
locales
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-17 17:43:54 +02:00
packs	Fix admin.js starting rails-ujs twice (fixes #8168) (#8213)	2018-08-15 23:38:31 +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	2018-08-17 17:43:54 +02:00