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

294a802b

Commit 294a802b authored 4 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'fixes' into 'pregmod-master'

More Fixes

Closes #2538

See merge request pregmodfan/fc-pregmod!8322

parents 1cce0afd e3a78b83

Branches

Tags

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/arcologyBuilding/penthouse.js 1 addition, 1 deletion

src/arcologyBuilding/penthouse.js
src/descriptions/familySummaries.js 1 addition, 1 deletion

src/descriptions/familySummaries.js
src/events/scheduled/pitFight.js 7 additions, 8 deletions

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

src/events/scheduled/sePCBirthday.desc.js
src/facilities/ads.js 13 additions, 25 deletions

src/facilities/ads.js

with 23 additions and 37 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