Thibaut Girka db200226b8 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	app/javascript/mastodon/initial_state.js
	db/schema.rb

Upstream added a new field to initial_state.
Not too sure about what happened with db/schema.rb though…

2018-06-15 20:51:39 +02:00

..

contrast

Fix text colors (#7227)

2018-04-22 14:29:40 +02:00

fonts

Font styles are now packagified

2017-11-18 11:05:00 -08:00

mastodon

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

2018-06-15 20:51:39 +02:00

mastodon-light

Uniform media and video spoiler settings and fix them of the light theme (#7778)

2018-06-10 16:54:22 +02:00

application.scss

Replace drawer elephant graphic with a vector image (#6286)

2018-01-19 15:25:27 +01:00

contrast.scss

Separate high contrast theme (#7213)

2018-04-21 21:35:55 +02:00

mailer.scss

Improve HTML e-mails based on Litmus tests (#6301)

2018-01-20 01:32:21 +01:00

mastodon-light.scss

More polished light theme (#7620)

2018-05-25 18:36:26 +02:00

win95.scss

Strip trailing whitespace on win95.scss

2018-01-18 10:54:50 -06:00