Commit eba5043b authored by Fulcrand Guilhem's avatar Fulcrand Guilhem
Browse files

Merge branch 'latest' into '55-change-builder-wrappers-to-use-jinja2-templates' 

# Conflicts:
#   builder/builder.py
#   jobs/python_test/versions/0.1.0.md
parents 41fd10b5 dba09bde
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment