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

f48c45df

Commit f48c45df authored 2 years ago by Pregmodder

Downloads
- Plain Diff

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

parents 283248b9 0f270eb9

No related branches found

No related tags found

1 merge request!11108Pregmod v4.0.0-alpha.20

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/endWeek/reports/spaReport.js 1 addition, 0 deletions

src/endWeek/reports/spaReport.js
src/events/intro/arcologySelection.js 1 addition, 1 deletion

src/events/intro/arcologySelection.js
src/gui/Encyclopedia/encyclopediaLore.js 5 additions, 5 deletions

src/gui/Encyclopedia/encyclopediaLore.js
src/player/desc/pLongBoobs.js 1 addition, 1 deletion

src/player/desc/pLongBoobs.js

with 8 additions and 7 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