Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

fc-pregmod
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

0140bfdf

Commit 0140bfdf authored 7 years ago by hexall90

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/pregmod-master' into SecExp

parents 101ea673 5aa88fbb

No related branches found

No related tags found

No related merge requests found

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

devNotes/AnatomyOfAFreeCitiesEvent.txt 0 additions, 0 deletions

devNotes/AnatomyOfAFreeCitiesEvent.txt
src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw 1 addition, 0 deletions

src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw
src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw 1 addition, 0 deletions

src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
src/pregmod/newChildIntro.tw 2 additions, 2 deletions

src/pregmod/newChildIntro.tw
src/pregmod/widgets/slaveSummaryWidgets.tw 40 additions, 10 deletions

src/pregmod/widgets/slaveSummaryWidgets.tw
src/uncategorized/RESS.tw 249 additions, 67 deletions

src/uncategorized/RESS.tw
src/uncategorized/longSlaveDescription.tw 19 additions, 4 deletions

src/uncategorized/longSlaveDescription.tw
src/uncategorized/randomIndividualEvent.tw 4 additions, 0 deletions

src/uncategorized/randomIndividualEvent.tw
src/uncategorized/saDevotion.tw 70 additions, 29 deletions

src/uncategorized/saDevotion.tw
src/uncategorized/saLongTermEffects.tw 1 addition, 1 deletion

src/uncategorized/saLongTermEffects.tw

with 387 additions and 113 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment