This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka e5a603206d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/accounts_controller.rb app/javascript/mastodon/locales/pl.json app/views/about/more.html.haml Conflicts in `accounts_controller.rb` resolved by taking upstream's version + our `use_pack`. Conflicts in `pl.json` resolved by taking upstream's changes. Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.		2018-08-10 16:22:31 +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-08-10 16:22:31 +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	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