Merge branch 'master' into 'nethunter'

# Conflicts:
#   .gitlab-ci.yml
This commit is contained in:
Re4son 2020-08-23 09:47:33 +00:00
commit 1db128e17a

View File

@ -66,7 +66,7 @@ assembleDebugAuto:
only:
- branches
except:
- nethunter
- master
assembleDebugManual:
extends: .assembleDebug
@ -75,7 +75,7 @@ assembleDebugManual:
assembleReleaseAuto:
extends: .assembleRelease
only:
- nethunter
- master
assembleReleaseManual:
extends: .assembleRelease