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

6679e40d

Commit 6679e40d authored 5 years ago by Pregmodder

Downloads
- Plain Diff

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

Pregmod v2.5.1.

See merge request pregmodfan/fc-pregmod!4849

parents 0b176585 2de2a7ad

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Changelog.txt 8 additions, 0 deletions

Changelog.txt
src/js/assignJS.js 4 additions, 1 deletion

src/js/assignJS.js
src/uncategorized/clinic.tw 8 additions, 0 deletions

src/uncategorized/clinic.tw
src/uncategorized/clinicReport.tw 1 addition, 1 deletion

src/uncategorized/clinicReport.tw
src/uncategorized/masterSuite.tw 25 additions, 1 deletion

src/uncategorized/masterSuite.tw
src/uncategorized/schoolroom.tw 8 additions, 0 deletions

src/uncategorized/schoolroom.tw
src/uncategorized/servantsQuarters.tw 2 additions, 2 deletions

src/uncategorized/servantsQuarters.tw

with 56 additions and 5 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