Code

Fix feature conflicts v2#253

Code

Closed

marioortizmanero wants to merge 10 commits intomasterramsayleung/rspotify:masterfrom fix-conflicts-2ramsayleung/rspotify:fix-conflicts-2Copy head branch name to clipboard

+327-303

Commits

Commits on Sep 19, 2021

• Attempt two at conflict fixing

  marioortizmanero

  committed
  518e622

  Copy full SHA for 518e622

• Merge branch 'fix-token-read' into fix-conflicts-2

  marioortizmanero

  committed
  b3536c6

  Copy full SHA for b3536c6

• More or less fix tests

  marioortizmanero

  committed
  52ee125

  Copy full SHA for 52ee125

• Generic client

  marioortizmanero

  committed
  6b0c8cb

  Copy full SHA for 6b0c8cb

• Fix examples and tests

  marioortizmanero

  committed
  9861d55

  Copy full SHA for 9861d55

Commits on Sep 20, 2021

• More or less fix tests and formatting

  marioortizmanero

  committed
  c35ab7e

  Copy full SHA for c35ab7e

• Fix CI

  marioortizmanero

  committed
  f151a09

  Copy full SHA for f151a09

• Fix warnings

  marioortizmanero

  committed
  f6efc0f

  Copy full SHA for f6efc0f

Commits on Sep 21, 2021

• Move rspotify-http into mod to fix last warnings

  marioortizmanero

  committed
  eb75b6c

  Copy full SHA for eb75b6c

• Bump versions

  marioortizmanero

  committed
  90a6d9e

  Copy full SHA for 90a6d9e