Skip to content
This repository was archived by the owner on Dec 17, 2024. It is now read-only.

Usody2018: Merge devel into master#36

Open
forste wants to merge 133 commits intousody2018-masterfrom
usody2018-devel
Open

Usody2018: Merge devel into master#36
forste wants to merge 133 commits intousody2018-masterfrom
usody2018-devel

Conversation

@forste
Copy link
Collaborator

@forste forste commented Apr 10, 2020

No description provided.

Stephan Fortelny added 30 commits April 12, 2018 16:01
…tabs, resource generators + factories, restructuring, etc.)
# Conflicts:
#	app/common/components/resource/resource-config.constant.js
#	app/common/components/resource/resource-list/resource-list.directive.html
# Conflicts:
#	app/common/components/resource/resource-config.constant.js
# Conflicts:
#	app/common/components/resource/resource-config.constant.js
…ored resource-list, rl-view, rl-getter and rl-selector to work with multiple lots.
…ted. Display number of total and displayed devices above table. Display number of selected devices in selection panel
Stephan Fortelny added 30 commits June 5, 2018 10:30
…eight from fill height bar on sm-sized viewpoint
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant