luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-15 09:56:47 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
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
..
core Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
flavours Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
fonts
images Merge branch 'master' into glitch-soc/merge-upstream 2020-01-24 14:37:06 +01:00
locales
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
skins
styles Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00