Thibaut Girka 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes).		2018-08-17 17:43:54 +02:00
..
contrast
fonts
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-17 17:43:54 +02:00
mastodon-light	Revert "Fix dark background error on user-mention autosuggest (#7937)" (#7964)	2018-07-06 13:19:18 +02:00
application.scss	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
contrast.scss
mailer.scss
mastodon-light.scss	More polished light theme (#7620)	2018-05-25 18:36:26 +02:00
win95.scss