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

6f5de285

Commit 6f5de285 authored 6 years ago by Pregmodder

Downloads
- Plain Diff

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

Removed 'use strict' to fix JS issue + Superfetation work

See merge request pregmodfan/fc-pregmod!4152

parents 558d61fd 6e2dbe72

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/js/eventSelectionJS.js 14 additions, 2 deletions

src/js/eventSelectionJS.js
src/js/futureSocietyJS.js 0 additions, 1 deletion

src/js/futureSocietyJS.js
src/js/utilJS.js 1 addition, 1 deletion

src/js/utilJS.js
src/uncategorized/newSlaveIntro.tw 1 addition, 1 deletion

src/uncategorized/newSlaveIntro.tw
src/uncategorized/slaveInteract.tw 2 additions, 2 deletions

src/uncategorized/slaveInteract.tw
src/utility/miscWidgets.tw 1 addition, 1 deletion

src/utility/miscWidgets.tw

with 19 additions and 8 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