Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
FabianTerhorst committed Jun 27, 2019
2 parents 5b68485 + 37842e1 commit 5bf824a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ os:
filter_secrets: false
sudo: false
language: cpp
branches:
only:
- master
- dev
#branches:
# only:
# - master
# - dev
matrix:
include:
- os: linux
Expand Down

0 comments on commit 5bf824a

Please sign in to comment.