Mastodon/javascript at 0f90e624c54a1a2ef810d06c7e3dd75baa063227 - Mastodon - Wobbl.XYZ Git Repository

tarrien/Mastodon

History

Claire 0f90e624c5 Merge commit '672c9f5f05bde788877ae0dcdb6668366c4c8941' into glitch-soc/merge-upstream

Conflicts:
- `app/helpers/application_helper.rb`:
  Conflict due to our theming system being different.
  Ported upstream's changes.

2024-05-01 16:10:45 +02:00

..

…

[Glitch] Fix logo pushing header buttons out of view on certain conditions in mobile layout

2024-05-01 15:56:38 +02:00

…

…

…

Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream

2024-03-19 19:21:12 +01:00

Merge commit '672c9f5f05bde788877ae0dcdb6668366c4c8941' into glitch-soc/merge-upstream

2024-05-01 16:10:45 +02:00

Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream

2024-04-06 20:34:07 +02:00

Change how theme style packs are loaded

2024-04-28 15:45:41 +02:00

Rename app/javascript/flavours/glitch/styles/index.scss to application.scss

2024-04-30 21:03:04 +02:00

Merge commit '8a498f4e65ecf27cc2c992d02b47f890dafef20b' into glitch-soc/merge-upstream

2024-05-01 14:50:16 +02:00

…

…