Merge PRs and fix issues

This commit is contained in:
danielyxie
2018-06-26 09:49:28 -05:00
parent 89ecb15b6f
commit 13dbd9f26c
6 changed files with 25001 additions and 25178 deletions
+2 -1
View File
@@ -24,7 +24,8 @@ import {Corporation} from "./CompanyManagement.js";
import {CONSTANTS} from "./Constants.js";
import {displayCreateProgramContent,
getNumAvailableCreateProgram,
initCreateProgramButtons} from "./CreateProgram.js";
initCreateProgramButtons,
Programs} from "./CreateProgram.js";
import {displayFactionContent, joinFaction,
processPassiveFactionRepGain, Factions,
inviteToFaction, initFactions} from "./Faction.js";