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

f855b1d6

Commit f855b1d6 authored 2 years ago by Pregmodder

Downloads
- Plain Diff

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

Fixes

Closes #4307 and #4305

See merge request !11097

parents 71ab8e88 629ba8e4

No related branches found

No related tags found

1 merge request!11097Fixes

Pipeline #52510 passed 2 years ago

Stage: build

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/arcologyBuilding/presets.js 0 additions, 2 deletions

src/arcologyBuilding/presets.js
src/descriptions/familySummaries.js 0 additions, 1 deletion

src/descriptions/familySummaries.js
src/facilities/bodyModification/bodyModification.js 9 additions, 8 deletions

src/facilities/bodyModification/bodyModification.js
src/futureSocieties/fsDecoration.js 0 additions, 1 deletion

src/futureSocieties/fsDecoration.js
src/js/familyTreeJS.js 0 additions, 7 deletions

src/js/familyTreeJS.js

with 9 additions and 19 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