mastodon/app/javascript/packs
Thibaut Girka a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- .eslintrc.yml
  Removed, as upstream removed it.
- app/controllers/admin/statuses_controller.rb
  Minor code cleanup when porting one of our features.
- app/models/account.rb
  Note length validation has changed upstream.
  We now use upstream's validation (dropped legacy glitch-soc
  account metadata stuff) but with configurable limit.
- app/services/post_status_service.rb
  Upstream has added support for scheduled toots, refactoring
  the code a bit. Adapted our changes to this refactoring.
- app/views/stream_entries/_detailed_status.html.haml
  Not a real conflict, changes too close.
- app/views/stream_entries/_simple_status.html.haml
  Not a real conflict, changes too close.
2019-01-10 21:00:30 +01: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
public.js Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00
share.js Upgrade webpack to version v4.x (#6655) 2018-07-14 03:56:41 +02:00