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

39c2642e

Commit 39c2642e authored 4 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'fs-pulldown' into 'pregmod-master'

Fs pulldown

See merge request pregmodfan/fc-pregmod!8436

parents 31bddcc4 e16f0af1

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/facilities/fsDecoration.js 136 additions, 19 deletions

src/facilities/fsDecoration.js
src/gui/options/options.js 15 additions, 0 deletions

src/gui/options/options.js
src/uncategorized/futureSociety.tw 1 addition, 61 deletions

src/uncategorized/futureSociety.tw

with 152 additions and 80 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