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

1dc7ab36

Commit 1dc7ab36 authored 3 years ago by Anu

Downloads
- Plain Diff

Merge branch 'pregmod-master' into 'minor-fixes'

# Conflicts:
#   src/facilities/brothel/brothel.js

parents c01a603d acb106cb

No related branches found

No related tags found

1 merge request!10122Minor improvements

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/facilities/brothel/brothel.js 4 additions, 4 deletions

src/facilities/brothel/brothel.js
src/facilities/cellblock/cellblock.js 9 additions, 9 deletions

src/facilities/cellblock/cellblock.js
src/facilities/masterSuite/masterSuite.js 13 additions, 13 deletions

src/facilities/masterSuite/masterSuite.js

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