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 7782e4dc0d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/about_controller.rb`:
  Minor conflict caused by glitch-soc's theming system.
  Ported upstream changes.
2020-12-10 09:41:49 +01:00
..
about.js
application.js
common.js
error.js
public-path.js
public.js Merge branch 'master' into glitch-soc/merge-upstream 2020-12-10 09:41:49 +01:00
share.js