Merge branch 'master' of https://github.com/lightsprint09/DBNetworkStack

# Conflicts: # .travis.yml # DBNetworkStack.podspec # README.md # Source/Info.plist # Source/RetryNetworkTask.swift # Tests/DBNetworkStackTests/NetworkServiceTest.swift # Tests/DBNetworkStackTests/RetryNetworkserviceTest.swift # Tests/DBNetworkStackTests/RetryTaskTest.swift
dbsystel · Aug 22, 2018 · dc0c38c · dc0c38c
2 parents e44fdc9 + 1e35388
commit dc0c38c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -33,8 +33,8 @@ matrix:
         - bash <(curl -s https://codecov.io/bash)
       deploy:
         provider: pages
-        local_dir: ${TRAVIS_BUILD_DIR}/docs
+        local_dir: docs
         skip_cleanup: true
         github_token: $GITHUB_TOKEN
         on:
-          branch: master
+          branch: master