Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

fc-pregmod
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

b28c4045

Commit b28c4045 authored 4 years ago by Pregmodder

Downloads
- Plain Diff

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

Fixes

Closes #1732 and #1733

See merge request !6659

parents d766d86c bfa2d062

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/endWeek/saPleaseYou.js 2 additions, 2 deletions

src/endWeek/saPleaseYou.js
src/endWeek/saServeThePublic.js 6 additions, 0 deletions

src/endWeek/saServeThePublic.js
src/interaction/budgets/recordTemplates.js 1 addition, 0 deletions

src/interaction/budgets/recordTemplates.js
src/js/economyJS.js 1 addition, 0 deletions

src/js/economyJS.js
src/uncategorized/costsBudget.js 1 addition, 0 deletions

src/uncategorized/costsBudget.js
src/uncategorized/saRules.tw 1 addition, 1 deletion

src/uncategorized/saRules.tw

with 12 additions and 3 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