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

15df67ce

Commit 15df67ce authored 4 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'renaming-slaves-by-FS' into 'pregmod-master'

Renaming slaves for FS; fix gating, move files.

Closes #2695

See merge request pregmodfan/fc-pregmod!8646

parents 6ffdf7dc 3798b8ed

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/futureSocieties/aztec/slaveSacrifice.tw 0 additions, 0 deletions

src/futureSocieties/aztec/slaveSacrifice.tw
src/futureSocieties/fsDecoration.js 0 additions, 0 deletions

src/futureSocieties/fsDecoration.js
src/futureSocieties/fsPassage.js 6 additions, 2 deletions

src/futureSocieties/fsPassage.js
src/futureSocieties/futureSociety.js 0 additions, 0 deletions

src/futureSocieties/futureSociety.js

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