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

0fa5c724

Commit 0fa5c724 authored 6 years ago by Pregmodder

Downloads
- Plain Diff

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

Supplied fixes

See merge request pregmodfan/fc-pregmod!3564

parents ffd7cd21 1a61013a

No related branches found

No related tags found

1 merge request!3564Supplied fixes

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/js/DefaultRules.js 4 additions, 4 deletions

src/js/DefaultRules.js
src/pregmod/manageCorporation.tw 3 additions, 3 deletions

src/pregmod/manageCorporation.tw
src/uncategorized/genericPlotEvents.tw 3 additions, 3 deletions

src/uncategorized/genericPlotEvents.tw
src/uncategorized/slaveInteract.tw 1 addition, 2 deletions

src/uncategorized/slaveInteract.tw

with 11 additions and 12 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