Skip to content
Snippets Groups Projects
Commit 1eb37f41 authored by Cédric Moreau's avatar Cédric Moreau
Browse files

Merge branch 'dev' 

# Conflicts:
#	appveyor.yml
#	ci/arm/make_arm_deb_package.sh
#	ci/travis/before_deploy.sh
parents f87bbcd5 e4a03e03
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 406 additions and 744 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment