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

080475ab

Commit 080475ab authored 2 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'fix' into 'pregmod-master'

Fixes

Closes #4488, #4476, #4485, and #4478

See merge request pregmodfan/fc-pregmod!11264

parents 670fd5da a31eac01

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

css/gui/tooltips/tippy.css 1 addition, 0 deletions

css/gui/tooltips/tippy.css
devTools/javaSanityCheck/excluded 0 additions, 2 deletions

devTools/javaSanityCheck/excluded
sanityCheck.sh 1 addition, 1 deletion

sanityCheck.sh
src/events/nonRandom/rival/pRivalryActions.js 7 additions, 3 deletions

src/events/nonRandom/rival/pRivalryActions.js
src/markets/marketUI.js 4 additions, 1 deletion

src/markets/marketUI.js

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