Thibaut Girka 11cc2e099a Merge branch 'master' into glitch-soc/merge-master ...

Conflicts:
	app/javascript/styles/mastodon-light.scss
	config/themes.yml

Removed config/themes.yml, took upstream's mastodon-light.scss

2018-05-25 18:59:02 +02:00

..

core

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05:00

flavours

Merge pull request #505 from ThibG/glitch-soc/features/fetch-relationships-on-search

2018-05-23 18:54:51 +02:00

fonts

Theme: Windows 95

2017-10-26 23:22:48 -07:00

images

Merge branch 'master' of https://github.com/tootsuite/mastodon

2018-02-23 23:28:31 +09:00

locales

Javascript intl8n flavour support

2017-12-10 11:08:04 -08:00

mastodon

Merge branch 'master' into glitch-soc/merge-master

2018-05-25 18:59:02 +02:00

packs

Merge branch 'master' into glitch-soc/merge

2018-05-14 20:51:50 +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-master

2018-05-25 18:59:02 +02:00