Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

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

Snippets Groups Projects

8006445a

Commit 8006445a authored 6 years ago by Pregmodder

Downloads
- Plain Diff

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

parents 025b21fb 77dbc46a

No related branches found

No related tags found

2 merge requests!2047RA rework,!1682Bit of text cleaning

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/js/eventSelectionJS.tw 27 additions, 29 deletions

src/js/eventSelectionJS.tw
src/npc/newSlaveIncestSex.tw 1 addition, 1 deletion

src/npc/newSlaveIncestSex.tw
src/uncategorized/BackwardsCompatibility.tw 3 additions, 0 deletions

src/uncategorized/BackwardsCompatibility.tw
src/uncategorized/RETS.tw 28 additions, 28 deletions

src/uncategorized/RETS.tw
src/uncategorized/clinic.tw 1 addition, 1 deletion

src/uncategorized/clinic.tw
src/uncategorized/nextWeek.tw 1 addition, 1 deletion

src/uncategorized/nextWeek.tw
src/uncategorized/pRivalryActions.tw 2 additions, 17 deletions

src/uncategorized/pRivalryActions.tw
src/uncategorized/randomIndividualEvent.tw 0 additions, 1 deletion

src/uncategorized/randomIndividualEvent.tw
src/uncategorized/servantsQuarters.tw 1 addition, 1 deletion

src/uncategorized/servantsQuarters.tw

with 64 additions and 79 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