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

bd59fe24

Commit bd59fe24 authored 11 months ago by delizious

Downloads
- Plain Diff

Merge branch 'pregmod-master' into ra-ui-grid-layout

# Conflicts:
#	css/rulesAssistant/raLists.css

parents eb8929eb 438ccbba

No related branches found

No related tags found

1 merge request!11925Ra ui grid layout

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

css/rulesAssistant/raLists.css 5 additions, 1 deletion

css/rulesAssistant/raLists.css
js/003-data/gameVariableData.js 2 additions, 0 deletions

js/003-data/gameVariableData.js
src/002-config/fc-version.js 1 addition, 1 deletion

src/002-config/fc-version.js
src/data/backwardsCompatibility/backwardsCompatibility.js 2 additions, 0 deletions

src/data/backwardsCompatibility/backwardsCompatibility.js
src/gui/options/options.js 4 additions, 0 deletions

src/gui/options/options.js
src/js/rulesAssistantOptions.js 10 additions, 5 deletions

src/js/rulesAssistantOptions.js

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