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

467e5a4f

Commit 467e5a4f authored 4 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'pregmod-master' into 'pregmod-master'

Fixes

See merge request !6848

parents 629a0afc 8d7898c6

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

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

src/endWeek/saServeYourOtherSlaves.js
src/facilities/nursery/nurseryFramework.js 2 additions, 2 deletions

src/facilities/nursery/nurseryFramework.js
src/gui/Encyclopedia/encyclopediaDialog.js 2 additions, 2 deletions

src/gui/Encyclopedia/encyclopediaDialog.js
src/gui/quicklinks.js 1 addition, 1 deletion

src/gui/quicklinks.js
src/js/slaveListing.js 6 additions, 1 deletion

src/js/slaveListing.js
src/uncategorized/RESS.tw 1 addition, 1 deletion

src/uncategorized/RESS.tw
src/uncategorized/dairy.tw 1 addition, 1 deletion

src/uncategorized/dairy.tw
src/uncategorized/neighborInteract.tw 0 additions, 10 deletions

src/uncategorized/neighborInteract.tw
src/uncategorized/reBusyArcade.tw 1 addition, 1 deletion

src/uncategorized/reBusyArcade.tw

with 17 additions and 22 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