Merge branch 'beta' into mergemaster
# Conflicts: # src/main.cpp
This commit is contained in:
1
contrib/ci-workers/templates/host.ec2.j2
Normal file
1
contrib/ci-workers/templates/host.ec2.j2
Normal file
@@ -0,0 +1 @@
|
||||
OS: {{ ansible_distribution }} {{ ansible_distribution_version }}
|
||||
Reference in New Issue
Block a user