Skip to content
Snippets Groups Projects
Commit 3c08ee13 authored by SteelT's avatar SteelT
Browse files

Merge branch 'master' into travis-deployer

# Conflicts:
#	.travis.yml
parents 2592f42a addf2bb3
Branches
No related tags found
1 merge request!449Deploy OS X and Debian packages from Travis-CI
Showing
with 145 additions and 322 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment