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

ae3d9823

Commit ae3d9823 authored 4 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'salon-js-2' into 'pregmod-master'

Salon js 2

See merge request !7273

parents 19eeb1e8 9bc72967

Branches

Tags

1 merge request!7273Salon js 2

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

js/003-data/slaveMods.js 205 additions, 0 deletions

js/003-data/slaveMods.js
src/facilities/nursery/childInteract.tw 1 addition, 1 deletion

src/facilities/nursery/childInteract.tw
src/interaction/prostheticConfig.tw 1 addition, 1 deletion

src/interaction/prostheticConfig.tw
src/interaction/slaveInteract.js 0 additions, 2 deletions

src/interaction/slaveInteract.js
src/js/modification.js 0 additions, 221 deletions

src/js/modification.js
src/js/salon.js 608 additions, 113 deletions

src/js/salon.js
src/uncategorized/salon.tw 15 additions, 269 deletions

src/uncategorized/salon.tw

with 830 additions and 607 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