luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-09-06 02:06:33 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript/styles
History
Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
2019-07-23 10:51:07 +02:00
..
contrast Fix sass-lint config (#10982) 2019-06-06 18:51:46 +02:00
fonts
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
mastodon-light Fix more issues in the light theme (#10996) 2019-06-08 22:32:59 +02:00
application.scss Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247) 2019-07-07 16:16:51 +02:00
contrast.scss
mailer.scss Fix sass-lint config (#10982) 2019-06-06 18:51:46 +02:00
mastodon-light.scss
win95.scss