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

e1e5219f

Commit e1e5219f authored 5 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'incubator' into 'pregmod-master'

Description Options Bug Fix

See merge request pregmodfan/fc-pregmod!4394

parents 707c27b7 185a417b

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

.eslintrc.json 1 addition, 1 deletion

.eslintrc.json
src/gui/Encyclopedia/encyclopedia.tw 1 addition, 1 deletion

src/gui/Encyclopedia/encyclopedia.tw
src/js/colorinput.js 1 addition, 1 deletion

src/js/colorinput.js
src/js/economyJS.js 1 addition, 1 deletion

src/js/economyJS.js
src/js/nurseryWidgets.js 5 additions, 5 deletions

src/js/nurseryWidgets.js
src/js/textbox2.js 1 addition, 1 deletion

src/js/textbox2.js
src/pregmod/seFCTVremote.tw 15 additions, 15 deletions

src/pregmod/seFCTVremote.tw
src/uncategorized/descriptionOptions.tw 3 additions, 3 deletions

src/uncategorized/descriptionOptions.tw

with 28 additions and 28 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