mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-28 13:33:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/app/javascript/flavours/glitch/packs
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
..
about.js Rename themes -> flavours ? ? 2017-12-03 23:26:40 -08:00
common.js Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
error.js Port upstream's javascript to the error page 2019-02-17 12:27:01 +01:00
home.js Rename themes -> flavours ? ? 2017-12-03 23:26:40 -08:00
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
share.js Rename themes -> flavours ? ? 2017-12-03 23:26:40 -08:00