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

c308b596

Commit c308b596 authored 4 years ago by Pregmodder

Downloads
- Plain Diff

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

parents e5775912 e4f6ce09

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/endWeek/saServeThePublic.js 8 additions, 20 deletions

src/endWeek/saServeThePublic.js
src/endWeek/saServeYourOtherSlaves.js 3 additions, 5 deletions

src/endWeek/saServeYourOtherSlaves.js
src/endWeek/saWhore.js 8 additions, 20 deletions

src/endWeek/saWhore.js
src/endWeek/slaveAssignmentReport.js 3 additions, 4 deletions

src/endWeek/slaveAssignmentReport.js
src/interaction/slaveInteract.js 22 additions, 30 deletions

src/interaction/slaveInteract.js
src/js/birth/birth.js 1 addition, 1 deletion

src/js/birth/birth.js
src/js/birth/birthDescriptions.js 34 additions, 29 deletions

src/js/birth/birthDescriptions.js
src/js/sexActsJS.js 3 additions, 43 deletions

src/js/sexActsJS.js

with 82 additions and 152 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