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

f7a74ca8

Commit f7a74ca8 authored 5 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'hotfixes' into 'pregmod-master'

ageAndHealth and eyeDescription fixes

Closes #638

See merge request pregmodfan/fc-pregmod!4176

parents 7279ae9b c4084f07

No related branches found

No related tags found

No related merge requests found

Changes 8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

sanityCheck.sh 2 additions, 0 deletions

sanityCheck.sh
src/SpecialForce/SpecialForce.js 2 additions, 2 deletions

src/SpecialForce/SpecialForce.js
src/endWeek/saServant.js 2 additions, 2 deletions

src/endWeek/saServant.js
src/facilities/nursery/longChildDescription.tw 1 addition, 1 deletion

src/facilities/nursery/longChildDescription.tw
src/interaction/main/mainLinks.js 1 addition, 1 deletion

src/interaction/main/mainLinks.js
src/js/descriptionWidgets.js 265 additions, 262 deletions

src/js/descriptionWidgets.js
src/js/slaveSummaryWidgets.js 1 addition, 1 deletion

src/js/slaveSummaryWidgets.js
src/uncategorized/longSlaveDescription.tw 1 addition, 1 deletion

src/uncategorized/longSlaveDescription.tw

with 275 additions and 270 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