cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-09 16:09:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into MergeConflictsSuck

Browse Source
This commit is contained in:
CorruptComputer
2015-06-16 09:35:30 -05:00
parent d5999716d1 26d75cc5ba
commit 91c63cd602
200 changed files with 1958 additions and 1031 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@@ -3,8 +3,8 @@ language: c
env:
global:
- BYOND_MAJOR="506"
- BYOND_MINOR="1247"
- BYOND_MAJOR="507"
- BYOND_MINOR="1286"
matrix:
- DM_MAPFILE="tgstation2"
- DM_MAPFILE="metastation"