Commit 34c7897d authored by Anton's avatar Anton

Merge branch 'master' of gitlab.rlp.net:motionbank/applications/systems-frontend

 Conflicts:
	src/store/modules/mosys.js
parents 59f3d56c fcb52905
Pipeline #29025 passed with stage
in 2 minutes and 17 seconds