cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source 
Conflicts:
	.travis.yml
This commit is contained in:
PsiOmegaDelta
2016-01-06 18:35:31 +01:00
parent 4ed1e118fc 0175c19748
commit e54e2d3e3c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@@ -3,8 +3,8 @@ language: c
sudo: false sudo: false
env: env:
BYOND_MAJOR="508" BYOND_MAJOR="509"
BYOND_MINOR="1293" BYOND_MINOR="1318"
MACRO_COUNT=1158 MACRO_COUNT=1158
cache: cache: