Merge pull request #9485 from nextcloud/feature/9441/multiple_token_providers

core/Migrations/Version14000Date20180518120534.php

lib/composer/composer/autoload_classmap.php

lib/composer/composer/autoload_static.php

lib/private/Authentication/Token/DefaultToken.php

lib/private/Authentication/Token/DefaultTokenMapper.php

lib/private/Authentication/Token/DefaultTokenProvider.php

lib/private/Authentication/Token/IProvider.php

lib/private/Authentication/Token/Manager.php

lib/private/Authentication/Token/PublicKeyToken.php

lib/private/Authentication/Token/PublicKeyTokenMapper.php

lib/private/Authentication/Token/PublicKeyTokenProvider.php

lib/private/Server.php

settings/Controller/AuthSettingsController.php

tests/Settings/Controller/AuthSettingsControllerTest.php

...s/lib/Authentication/Token/DefaultTokenCleanupJobTest.php

tests/lib/Authentication/Token/DefaultTokenMapperTest.php

tests/lib/Authentication/Token/DefaultTokenProviderTest.php

tests/lib/Authentication/Token/ManagerTest.php

tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php

...s/lib/Authentication/Token/PublicKeyTokenProviderTest.php