djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-12-01 04:20:13 -05:00
Code Issues Packages Projects Releases Wiki Activity
45d1f34a30
tootlab-mastodon/app/javascript/packs
History
Thibaut Girka 8c3c27bf06 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Upstream change too close to a glitch-soc change related to
  instance-local toots. Merged upstream changes.
- `app/services/fan_out_on_write_service.rb`:
  Minor conflict due to glitch-soc's handling of Direct Messages,
  merged upstream changes.
- `yarn.lock`:
  Not really a conflict, caused by glitch-soc-only dependencies
  being textually too close to updated upstream dependencies.
  Merged upstream changes.
2020-08-30 16:13:08 +02:00
..
about.js Upgrade webpack to version v4.x (#6655) 2018-07-14 03:56:41 +02:00
application.js Upgrade webpack to version v4.x (#6655) 2018-07-14 03:56:41 +02:00
common.js Upgrade webpack to version v4.x (#6655) 2018-07-14 03:56:41 +02:00
error.js Change error graphic to hover-to-play (#10055) 2019-02-15 23:33:25 +01:00
public.js Merge branch 'master' into glitch-soc/merge-upstream 2020-08-13 22:17:29 +02:00
share.js Upgrade webpack to version v4.x (#6655) 2018-07-14 03:56:41 +02:00
two_factor_authentication.js Add WebAuthn as an alternative 2FA method (#14466) 2020-08-24 16:46:27 +02:00