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

8393f2ce

Commit 8393f2ce authored 4 years ago by Pregmodder

Downloads
- Plain Diff

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

Fixes

Closes #2728, #2725, and #2726

See merge request !8692

parents 0adedb0d dbcf9adb

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

js/003-data/miscDataNames.js 1 addition, 1 deletion

js/003-data/miscDataNames.js
js/artInfrastructure.js 1 addition, 1 deletion

js/artInfrastructure.js
src/npc/generate/newSlaveIntro.js 11 additions, 1 deletion

src/npc/generate/newSlaveIntro.js
src/uncategorized/reMalefactor.tw 4 additions, 6 deletions

src/uncategorized/reMalefactor.tw

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