FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
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/core
History
Thibaut Girka 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes.
 		2020-03-22 16:10:44 +01:00
..
admin.js Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
common.js
…
embed.js
…
mailer.js
…
public.js Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
settings.js Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
theme.yml
…