David Yip 3d033a4687 Merge remote-tracking branch 'tootsuite/master' into merge-upstream ...

Conflicts:
	Gemfile
	config/locales/simple_form.pl.yml

2018-02-17 00:02:37 -06:00

..

core

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-24 19:17:11 +00:00

flavours

Revert 245816ab27 (fixes #348)

2018-02-10 20:59:50 +01:00

fonts

Theme: Windows 95

2018-01-05 16:22:58 -08:00

images

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-24 19:17:11 +00:00

locales

…

mastodon

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2018-02-17 00:02:37 -06:00

packs

Fix hide and show media button on admin page (#6347)

2018-01-24 13:29:46 +01:00

skins/vanilla/win95

…

styles

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2018-02-17 00:02:37 -06:00