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

fd2ef4cc

Commit fd2ef4cc authored 4 years ago by Pregmodder

Downloads
- Plain Diff

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

parents 5e19b7e5 4a3c3f73

No related branches found

No related tags found

Loading

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

src/art/artJS.js 1 addition, 1 deletion

src/art/artJS.js
src/facilities/farmyard/farmerSelect.tw 1 addition, 1 deletion

src/facilities/farmyard/farmerSelect.tw
src/facilities/nursery/matronSelect.tw 1 addition, 1 deletion

src/facilities/nursery/matronSelect.tw
src/gui/quicklinks.js 34 additions, 11 deletions

src/gui/quicklinks.js
src/uncategorized/attendantSelect.tw 1 addition, 1 deletion

src/uncategorized/attendantSelect.tw
src/uncategorized/concubineSelect.tw 1 addition, 1 deletion

src/uncategorized/concubineSelect.tw
src/uncategorized/djSelect.tw 1 addition, 1 deletion

src/uncategorized/djSelect.tw
src/uncategorized/hgSelect.tw 1 addition, 1 deletion

src/uncategorized/hgSelect.tw
src/uncategorized/madamSelect.tw 1 addition, 1 deletion

src/uncategorized/madamSelect.tw
src/uncategorized/milkmaidSelect.tw 1 addition, 1 deletion

src/uncategorized/milkmaidSelect.tw
src/uncategorized/nurseSelect.tw 1 addition, 1 deletion

src/uncategorized/nurseSelect.tw
src/uncategorized/schoolteacherSelect.tw 1 addition, 1 deletion

src/uncategorized/schoolteacherSelect.tw
src/uncategorized/stewardessSelect.tw 1 addition, 1 deletion

src/uncategorized/stewardessSelect.tw
src/uncategorized/wardenessSelect.tw 1 addition, 1 deletion

src/uncategorized/wardenessSelect.tw

with 47 additions and 24 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