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

117bce67

Commit 117bce67 authored 4 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'removeActiveSlave' into 'pregmod-master'

RemoveActiveSlave

See merge request !8465

parents 65241ae4 de678af8

No related branches found

No related tags found

No related merge requests found

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

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

src/js/economyJS.js
src/js/familyTreeJS.js 0 additions, 29 deletions

src/js/familyTreeJS.js
src/uncategorized/genericPlotEvents.tw 1198 additions, 1327 deletions

src/uncategorized/genericPlotEvents.tw
src/uncategorized/reMalefactor.tw 379 additions, 437 deletions

src/uncategorized/reMalefactor.tw
src/uncategorized/seCustomSlaveDelivery.tw 69 additions, 68 deletions

src/uncategorized/seCustomSlaveDelivery.tw
src/uncategorized/seRetirement.tw 69 additions, 69 deletions

src/uncategorized/seRetirement.tw

with 1719 additions and 1934 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