CatCatNya/catstodon
4
2
Fork 0
forked from glitch-soc-github-mirror/mastodon
Code Issues 11 Pull requests Projects 1 Releases 15 Wiki Activity
catstodon/app/javascript
History
Exact
Jeremy Kescher 7318b74ebf
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	Gemfile.lock
#	app/models/notification.rb
#	config/locales/simple_form.de.yml
2023-03-05 12:34:16 +01:00
..
core [Glitch] Run eslint --fix 2023-02-03 20:52:07 +01:00
flavours Merge remote-tracking branch 'upstream/main' into develop 2023-03-05 12:34:16 +01:00
fonts Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
icons png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00
images Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2018-12-01 21:00:16 +01:00
mastodon Merge remote-tracking branch 'upstream/main' into develop 2023-03-05 12:34:16 +01:00
packs Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
skins Merge remote-tracking branch 'upstream/main' into develop 2022-12-09 14:47:08 +01:00
styles Merge remote-tracking branch 'upstream/main' into develop 2023-03-05 12:34:16 +01:00