Merge remote-tracking branch 'origin/master' into micha

This commit is contained in:
Mischa ter Smitten 2017-01-12 14:07:35 +01:00
commit c8bb148084
1 changed files with 3 additions and 0 deletions

View File

@ -4,3 +4,6 @@
apt_manage_sources_list: true apt_manage_sources_list: true
apt_src_enable: false apt_src_enable: false
apt_install_state: present apt_install_state: present
# Temporary fix for failing build: https://travis-ci.org/tus/tusd/jobs/190891590
apt_upgrade: false