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

69054950

Commit 69054950 authored 5 years ago by lowercasedonkey

Downloads
- Plain Diff

Merge branch 'pregmod-master' into add-mother-father-to-pronouns

parents add8b8c7 0980e80e

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/SecExp/js/secExp.js 59 additions, 61 deletions

src/SecExp/js/secExp.js
src/SecExp/widgets/miscSecExpWidgets.tw 14 additions, 7 deletions

src/SecExp/widgets/miscSecExpWidgets.tw
src/data/backwardsCompatibility/updateCustomSlaveOrder.js 43 additions, 0 deletions

src/data/backwardsCompatibility/updateCustomSlaveOrder.js
src/data/backwardsCompatibility/updateSlaveObject.js 8 additions, 1 deletion

src/data/backwardsCompatibility/updateSlaveObject.js
src/js/DefaultRules.js 24 additions, 53 deletions

src/js/DefaultRules.js
src/js/surgery.js 96 additions, 41 deletions

src/js/surgery.js
src/npc/databases/dSlavesDatabase.tw 1 addition, 1 deletion

src/npc/databases/dSlavesDatabase.tw
src/npc/slaveStats.tw 1 addition, 1 deletion

src/npc/slaveStats.tw
src/uncategorized/BackwardsCompatibility.tw 3 additions, 39 deletions

src/uncategorized/BackwardsCompatibility.tw

with 249 additions and 204 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