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

454016d0

Commit 454016d0 authored 7 years ago by Pregmodder

Downloads
- Plain Diff

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

Pregmod v1019-18

See merge request !672

parents f8541519 aae5dece

No related branches found

No related tags found

4 merge requests!843Delete Please.,!833Pregmod master,!758Pregmod master,!672Pregmod v1019-18

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/js/pregJS.tw 43 additions, 1 deletion

src/js/pregJS.tw
src/pregmod/managePersonalAffairs.tw 61 additions, 28 deletions

src/pregmod/managePersonalAffairs.tw
src/uncategorized/officeDescription.tw 8 additions, 0 deletions

src/uncategorized/officeDescription.tw
src/uncategorized/wardrobe.tw 1 addition, 1 deletion

src/uncategorized/wardrobe.tw
src/utility/miscWidgets.tw 1 addition, 0 deletions

src/utility/miscWidgets.tw

with 114 additions and 30 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