Merge pull request #2064 from conda-forge/allow-tokens-if-have

Merge pull request #2064 from conda-forge/allow-tokens-if-have #2069