Merge "Handling file loads and tmp dirs differently"
authorDan Radez <dradez@redhat.com>
Wed, 21 Sep 2016 14:13:58 +0000 (14:13 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 21 Sep 2016 14:13:59 +0000 (14:13 +0000)
1  2 
ci/deploy.sh

diff --cc ci/deploy.sh
Simple merge