luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2025-01-18 02:26:56 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Claire d8fdbb054e Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/validators/status_length_validator.rb`:
  Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real
  conflict.
  Applied upstream changes.
- `package.json`:
  glitch-soc-only dependency textually too close to a dependency updated
  upstream, not a real conflict.
  Applied upstream changes.
2021-03-02 12:06:58 +01:00
..
core
flavours [Glitch] Fix default searchTokens 2021-02-22 15:47:17 +01:00
fonts Theme: Windows 95 2017-10-26 23:22:48 -07:00
images
locales
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2021-03-02 12:06:58 +01:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2020-12-10 09:41:49 +01:00
skins
styles Merge branch 'main' into glitch-soc/merge-upstream 2021-02-22 15:23:46 +01:00