Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.		2019-03-05 19:23:16 +01:00
..
contrast	…
fonts	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-05 19:23:16 +01:00
mastodon-light	…
application.scss	Add polls (#10111)	2019-03-03 22:18:23 +01:00
contrast.scss	…
mailer.scss	…
mastodon-light.scss	…
win95.scss	…