luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-10-20 06:24:21 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript/styles
History
Thibaut Girka 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
  Conflict because we changed the number of default results to be
  configurable
- app/lib/settings/scoped_settings.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
  Addition of a new “noindex” site-wide setting,
  conflict due to our change of the two other site-wide settings
  (default flavour and skin instead of theme)
2019-09-13 18:13:43 +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-09-13 18:13:43 +02:00
mastodon-light Fix more visual issues with the audio player (#11654) 2019-08-25 15:09:19 +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 Add option to include reported statuses in warning e-mail (#11639) 2019-08-23 22:37:23 +02:00
mastodon-light.scss
win95.scss