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

7b47ca7d

Commit 7b47ca7d authored 11 months ago by Pregmodder

Downloads
- Plain Diff

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

Fixes

Closes #5155, #5167, #5124, and #5148

See merge request !11965

parents ed1d669e 3b58d782

No related branches found

No related tags found

1 merge request!11965Fixes

Pipeline #79697 passed 11 months ago

Stage: build

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/endWeek/economics/arcmgmt.js 13 additions, 21 deletions

src/endWeek/economics/arcmgmt.js
src/endWeek/reports/personalAttention.js 1 addition, 1 deletion

src/endWeek/reports/personalAttention.js
src/endWeek/saSocialEffects.js 8 additions, 8 deletions

src/endWeek/saSocialEffects.js
src/futureSocieties/fsPassage.js 29 additions, 0 deletions

src/futureSocieties/fsPassage.js
src/futureSocieties/futureSociety.js 30 additions, 0 deletions

src/futureSocieties/futureSociety.js

with 81 additions and 30 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