Merge branch '1.0'

.travis.yml

@@ -351,7 +351,9 @@ after_failure: |
 
 deploy:
   provider: releases
-  api_key: $GITAUTH
+  api_key:
+    # Uses token from user open62541-travis-release (managed by @Pro)
+    secure: dtn6ayBGoWzeVMM6xYpSRZly1XOhS/2jdiwEHd0hYZIr0dNq18CxTiqbGrUwW1JsSiXoHaGSZhUVr06O1P/tfC3Ma6i7ugyun+yXz6FdZiwirjURI8HQe+XwR4Ui3hqgQSOHLMK/xtOkjM28AN1jg9u3//Zep69xJVIGAqNT0bE=
   file:
     - open62541-win32.zip
     - open62541-win64.zip

tools/travis/travis_linux_after_success.sh

@@ -5,7 +5,7 @@ set -e
 if [ "$MINGW" = "true" ] && [ "${TRAVIS_REPO_SLUG}" = "open62541/open62541" ] && [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
     echo "=== Executing after_success scripts ==="
     # List branches where the doc should be pushed to the webpage
-    if [ "${TRAVIS_BRANCH}" = "master" ] || [ "${TRAVIS_BRANCH}" = "0.3" ]; then
+    if [ "${TRAVIS_BRANCH}" = "master" ] || [ "${TRAVIS_BRANCH}" = "0.3" ] || [ "${TRAVIS_BRANCH}" = "1.0" ]; then
         sh ./tools/travis/travis_push_doc.sh
     fi
     sh ./tools/travis/travis_push_release.sh;