Commit 1b1ccb49 authored by Aurelien's avatar Aurelien
Browse files

Merge branch 'latest' into '288-update-the-builder-to-add-default-stage-folder-and-pages-file' 

# Conflicts:
#   tools/builder/builder.py
parents 35627f13 b05f0712
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