alpheios-project / components / 2868 / 2

35%

master: 43%

push

travis-ci

Merge branch 'master' into issue-comp-339-action-panel

# Conflicts:
#	dist/alpheios-components.js
#	dist/alpheios-components.js.map
#	dist/alpheios-components.min.js
#	dist/style/style-safari.css.map
#	dist/style/style-safari.min.css
#	dist/style/style.css.map
#	dist/style/style.min.css
#	src/vue/components/panel-compact.vue
#	src/vue/vuex-modules/ui/toolbar-module.js

273 of 983 branches covered (27.77%)

Branch coverage included in aggregate %.

668 of 1732 relevant lines covered (38.57%)

75.89 hits per line