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

fbaef552

Commit fbaef552 authored 5 years ago by Pregmodder

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-dev

parents d3cc75bc 2827836f

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/endWeek/saDrugs.js 47 additions, 0 deletions

src/endWeek/saDrugs.js
src/facilities/nursery/childInteract.tw 9 additions, 0 deletions

src/facilities/nursery/childInteract.tw
src/facilities/nursery/nurseryWidgets.js 7 additions, 0 deletions

src/facilities/nursery/nurseryWidgets.js
src/interaction/slaveInteract.js 9 additions, 0 deletions

src/interaction/slaveInteract.js
src/js/DefaultRules.js 6 additions, 1 deletion

src/js/DefaultRules.js
src/js/rulesAssistantOptions.js 4 additions, 0 deletions

src/js/rulesAssistantOptions.js
src/js/slaveSummaryWidgets.js 3 additions, 0 deletions

src/js/slaveSummaryWidgets.js
src/uncategorized/longSlaveDescription.tw 2 additions, 0 deletions

src/uncategorized/longSlaveDescription.tw

with 87 additions and 1 deletion

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