Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

fc-pregmod
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

746e1d30

Commit 746e1d30 authored 3 years ago by Pregmodder

Downloads
- Plain Diff

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

Fixes

See merge request pregmodfan/fc-pregmod!9792

parents 0fb18885 c5f40ea1

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/events/JE/jeSlaveDisputeSlaveDeal.js 0 additions, 2 deletions

src/events/JE/jeSlaveDisputeSlaveDeal.js
src/events/schools/resMove.js 1 addition, 1 deletion

src/events/schools/resMove.js
src/interaction/sellSlave.js 2 additions, 2 deletions

src/interaction/sellSlave.js
src/js/eventSelectionJS.js 1 addition, 1 deletion

src/js/eventSelectionJS.js

with 4 additions and 6 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