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

d250fef9

Commit d250fef9 authored 4 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'custom-slave-to-js' into 'pregmod-master'

Custom slave to js

Closes #2389

See merge request !8026

parents e414bb60 a323dda7

No related branches found

No related tags found

Loading

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

js/003-data/policiesData.js 4 additions, 4 deletions

js/003-data/policiesData.js
src/003-assets/CSS/links.css 1 addition, 0 deletions

src/003-assets/CSS/links.css
src/markets/specificMarkets/customSlave.tw 0 additions, 1360 deletions

src/markets/specificMarkets/customSlave.tw
src/markets/specificMarkets/customSlaveMarket.js 866 additions, 13 deletions

src/markets/specificMarkets/customSlaveMarket.js
src/markets/theMarket/buySlaves.js 14 additions, 23 deletions

src/markets/theMarket/buySlaves.js
src/utility/slaveCreationWidgets.tw 0 additions, 515 deletions

src/utility/slaveCreationWidgets.tw

with 885 additions and 1915 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