tootlab-mastodon

mirror of https://github.com/glitch-soc/mastodon.git synced 2025-02-17 16:13:50 -05:00

History

Thibaut Girka 4aa6aba6ee Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/services/remove_status_service.rb
  Conflict because we still handle the direct timeline.
  Took upstream changes, with that one extra function call.
- config/locales/ca.yml
  Conflict because theme names were updated.
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.
- config/locales/oc.yml
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.
- config/locales/pl.yml
  Decided to *keep* the theme names even if they are useless
  to avoid future conflicts.

2019-03-16 20:59:33 +01:00

contrast

Fix color of static page links in high contrast theme (#10028 )

2019-02-13 05:30:49 +01:00

fonts

Font styles are now packagified

2017-11-18 11:05:00 -08:00

mastodon

Merge branch 'master' into glitch-soc/merge-upstream

2019-03-16 20:59:33 +01:00

mastodon-light

Disable box shadows for featured hashtags in light theme (#10034 )