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

6f1c742e

Commit 6f1c742e authored 4 years ago by Pregmodder

Downloads
- Plain Diff

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

Fixes

Closes #2950

See merge request !9147

parents df7d2a65 9df0a5cb

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

devTools/types/FC/human.d.ts 3 additions, 3 deletions

devTools/types/FC/human.d.ts
src/events/nonRandomEvent.js 2 additions, 2 deletions

src/events/nonRandomEvent.js
src/events/story/rival/pRivalryActions.js 1 addition, 0 deletions

src/events/story/rival/pRivalryActions.js
src/npc/startingGirls/editFamily.js 1 addition, 0 deletions

src/npc/startingGirls/editFamily.js
src/npc/startingGirls/startingGirls.js 2 additions, 2 deletions

src/npc/startingGirls/startingGirls.js

with 9 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