This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/javascript/packs
Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
  Port upstream's minor refactoring
2022-12-15 20:25:25 +01:00
..
admin.js Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597) 2022-11-17 11:05:09 +01:00
application.js Fix missing await (#19273) 2022-10-03 23:08:38 +02:00
common.js
error.js
public-path.js
public.js Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
share.js