as-ideas / oil / 310

24%

master: 31%

push

travis-ci

Merge branches 'OIL-186/softBlockingTags' and 'master' of https://github.com/as-ideas/oil into OIL-186/softBlockingTags

# Conflicts:
#	package-lock.json
#	src/scripts/core/core_tag_management.js
#	test/fixtures/tag-management/managed-results/active-managed-tags-with-purposes.html
#	test/fixtures/tag-management/managed-results/inactive-managed-tags-with-purposes.html
#	test/fixtures/tag-management/script-and-img-tag-with-purposes.html
#	test/specs/core/core_tag_management.spec.js
#	test/test_constants.js

237 of 1686 branches covered (14.06%)

Branch coverage included in aggregate %.

901 of 3037 relevant lines covered (29.67%)

6.29 hits per line