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

50e7518a

Commit 50e7518a authored 4 years ago by Pregmodder

Downloads
- Plain Diff

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

Fixes

Closes #2596 and #2620

See merge request pregmodfan/fc-pregmod!8503

parents f4f510c9 531c8ba1

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/facilities/fsDecoration.js 1 addition, 1 deletion

src/facilities/fsDecoration.js
src/js/releaseRules.js 5 additions, 1 deletion

src/js/releaseRules.js
src/markets/specificMarkets/schoolFutanari.js 103 additions, 101 deletions

src/markets/specificMarkets/schoolFutanari.js
src/uncategorized/resFailure.tw 2 additions, 2 deletions

src/uncategorized/resFailure.tw
src/uncategorized/tfsFarmUpgrade.tw 4 additions, 4 deletions

src/uncategorized/tfsFarmUpgrade.tw

with 115 additions and 109 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