David Yip 89a9d629f7 Merge remote-tracking branch 'origin/master' into gs-master ...

Conflicts:
	Gemfile.lock

2018-01-15 22:17:48 -06:00

..

core

Moved flavour UI into own prefs tab

2017-12-10 20:32:27 -08:00

flavours

Increase priority of favstar gold

2018-01-14 16:05:44 -08:00

fonts

Theme: Windows 95

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

images

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

2018-01-15 22:17:48 -06:00

locales

Javascript intl8n flavour support

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

mastodon

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

2018-01-15 22:17:48 -06:00

packs

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

2018-01-15 22:17:48 -06:00

skins/vanilla/win95

Ruby intl8n for themes

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

styles

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

2018-01-15 22:17:48 -06:00