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

76ccc958

Commit 76ccc958 authored 1 year ago by Pregmodder

Downloads
- Plain Diff

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

Fixes

Closes #4681 and #4680

See merge request !11420

parents d8a376f8 6a627f53

No related branches found

No related tags found

1 merge request!11420Fixes

Pipeline #64652 passed 1 year ago

Stage: build

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/endWeek/saChoosesOwnJob.js 2 additions, 3 deletions

src/endWeek/saChoosesOwnJob.js
src/events/scheduled/sePCBirthday.desc.js 3 additions, 2 deletions

src/events/scheduled/sePCBirthday.desc.js
src/events/scheduled/sePCBirthday.js 1 addition, 0 deletions

src/events/scheduled/sePCBirthday.js
src/facilities/incubator/inspectTankSettings.js 7 additions, 11 deletions

src/facilities/incubator/inspectTankSettings.js
src/npc/interaction/fDick.js 1 addition, 1 deletion

src/npc/interaction/fDick.js

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