Merge branch 'master' into v3

This commit is contained in:
Bastian Ike
2019-12-20 13:58:43 +01:00
2 changed files with 6 additions and 6 deletions

View File

@@ -6,9 +6,9 @@ cache: yarn
deploy:
- provider: s3
access_key_id:
secure: IqwsUtTxYBprni5jMtDFZxXzOwes6aTOKFcyEK6bN2uDjDTxbEf8Aub41I56dkzmCuxxN0233PktgTm8l3z62iK+dDbC/rwmBMBU4fVgtlehTt+wqaaJx1fyTytm2sgIXV5rsRCH+XUY5dfPEkv1FLYIDbw+YJ8Fm1vIEWQ7x1ROi1b59GuYwUSOq1ZQEH4lEfcsSJu4wLKuRjhGagHcucZ77Z+DBvwktwqe1g1L5S4TmFXCSaYV7ceYu9zRtzIiyN9AK6HAKXqptKJK541oYRaCOo3fPPkShKCYqFZDgUCd8ele4G1JaJObii7NznkpBsaZjhT1Yt1risf0hGZFSL9BPKRbBuvBpvoJx7t41ppo5CUot37bontiJ/tDJ1QKl34P5yqPatFKQnM6nlR3K+IW0EdNL1XcYLfKYkxh1loUasy5Zf26vC7j+Q9K2jubidd3YcqKWcC0VAttvB6hw60hQ3XdE9EcH5OzvhDg1Ju5zmq4VrHDL8ymHgRmZzQPtdpon5S0j9Z45YkTPqc2XGWJTuq1ED7Hq3wO/6ry4+roAeAmZ1qXLww+LWcm/Yki9/y++e19+JxhSFNWEZK4kn7K7TquumSF6gP7ukJj8TgG4kXRZs7vcl0J4nYJA/qYQFMbVfw8SgdXT/zLNQaK6RNH3x3uOMfl3VDt3sAY2rk=
secure: $AWS_ACCESS_KEY_ID
secret_access_key:
secure: f8ThXSrY6huRhUteqgcFm1e21DPOFcSlNq6SzmHEPbXn9XkzyQthjtZk5W1xboww+TJCs8um+mZ7liebBntF6YyS/2I/uA/XX957K6qpW9x3zOvqoEkhurJ8pJQA6HP0lJP2lwiDvIgytd1VafzPw1iqQjQVqblpuGodzFR/i17pISdj1NJD5HP6wNHCAukjPiYAhXDxuxdCb042fYtXE75MiidIwOcfBjmShAO1fOBxtHq9nyUg7esbMJavx6QAtXVxBuqOAPCU8rtJH7oq4b8FNuH1QtByAUqIG3dgXMdCltKRt0FP6+c5gpO5rWaGD0XkVPxhCo/XJcAbpNKdYXBRQtp5Ki2PAnnOJVJ5fp6raXNI5tereyIzYQPkoOrLruB9tWtCiFd0qHTuiqe4xVfTQK7EGxe99cKl1axxFDVeLayNOrsy9J1zob7i/HmGsgh2UT32+ao2TOn0IKx/5y7njyXpaBTokIk8qJlb0wIuT2R5LHfzKFK2EoI+v0EWWiZXHqSpUYpPMCF6QUNIotWm+61M8yHx9Z2/XzllZXEFA+ZAFOSTeNU8xCbZ3hhdIN6x8XQ23Qi1xVVfE1DT8ZrTmCzLPoQwvxnzR4wN157tbHfYFOiLc2cORv7HptdeipQhdUXBAD+7C5aGQxbu4pi7GNy0vKiaaNSG8RdZjIg=
secure: $AWS_SECRET_ACCESS_KEY
bucket: techradar.aoe.com
skip_cleanup: true
acl: public_read
@@ -19,9 +19,9 @@ deploy:
branch: master
- provider: s3
access_key_id:
secure: IqwsUtTxYBprni5jMtDFZxXzOwes6aTOKFcyEK6bN2uDjDTxbEf8Aub41I56dkzmCuxxN0233PktgTm8l3z62iK+dDbC/rwmBMBU4fVgtlehTt+wqaaJx1fyTytm2sgIXV5rsRCH+XUY5dfPEkv1FLYIDbw+YJ8Fm1vIEWQ7x1ROi1b59GuYwUSOq1ZQEH4lEfcsSJu4wLKuRjhGagHcucZ77Z+DBvwktwqe1g1L5S4TmFXCSaYV7ceYu9zRtzIiyN9AK6HAKXqptKJK541oYRaCOo3fPPkShKCYqFZDgUCd8ele4G1JaJObii7NznkpBsaZjhT1Yt1risf0hGZFSL9BPKRbBuvBpvoJx7t41ppo5CUot37bontiJ/tDJ1QKl34P5yqPatFKQnM6nlR3K+IW0EdNL1XcYLfKYkxh1loUasy5Zf26vC7j+Q9K2jubidd3YcqKWcC0VAttvB6hw60hQ3XdE9EcH5OzvhDg1Ju5zmq4VrHDL8ymHgRmZzQPtdpon5S0j9Z45YkTPqc2XGWJTuq1ED7Hq3wO/6ry4+roAeAmZ1qXLww+LWcm/Yki9/y++e19+JxhSFNWEZK4kn7K7TquumSF6gP7ukJj8TgG4kXRZs7vcl0J4nYJA/qYQFMbVfw8SgdXT/zLNQaK6RNH3x3uOMfl3VDt3sAY2rk=
secure: $AWS_ACCESS_KEY_ID
secret_access_key:
secure: f8ThXSrY6huRhUteqgcFm1e21DPOFcSlNq6SzmHEPbXn9XkzyQthjtZk5W1xboww+TJCs8um+mZ7liebBntF6YyS/2I/uA/XX957K6qpW9x3zOvqoEkhurJ8pJQA6HP0lJP2lwiDvIgytd1VafzPw1iqQjQVqblpuGodzFR/i17pISdj1NJD5HP6wNHCAukjPiYAhXDxuxdCb042fYtXE75MiidIwOcfBjmShAO1fOBxtHq9nyUg7esbMJavx6QAtXVxBuqOAPCU8rtJH7oq4b8FNuH1QtByAUqIG3dgXMdCltKRt0FP6+c5gpO5rWaGD0XkVPxhCo/XJcAbpNKdYXBRQtp5Ki2PAnnOJVJ5fp6raXNI5tereyIzYQPkoOrLruB9tWtCiFd0qHTuiqe4xVfTQK7EGxe99cKl1axxFDVeLayNOrsy9J1zob7i/HmGsgh2UT32+ao2TOn0IKx/5y7njyXpaBTokIk8qJlb0wIuT2R5LHfzKFK2EoI+v0EWWiZXHqSpUYpPMCF6QUNIotWm+61M8yHx9Z2/XzllZXEFA+ZAFOSTeNU8xCbZ3hhdIN6x8XQ23Qi1xVVfE1DT8ZrTmCzLPoQwvxnzR4wN157tbHfYFOiLc2cORv7HptdeipQhdUXBAD+7C5aGQxbu4pi7GNy0vKiaaNSG8RdZjIg=
secure: $AWS_SECRET_ACCESS_KEY
bucket: techradar-next.aoe.com
skip_cleanup: true
acl: public_read

View File

@@ -2379,8 +2379,8 @@ locate-path@^2.0.0:
path-exists "^3.0.0"
lodash-es@^4.2.0, lodash-es@^4.2.1:
version "4.17.4"
resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.4.tgz#dcc1d7552e150a0640073ba9cb31d70f032950e7"
version "4.17.15"
resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78"
lodash@^4.14.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1:
version "4.17.15"