# Conflicts:
#	src/app/pages/applications/chart-releases/chart-releases.component.ts
#	src/app/pages/common/entity/entity-form/services/field-relation.service.ts
#	src/app/pages/plugins/plugin-add/plugin-add.component.ts
#	src/app/pages/system/alertservice/alertservice-list/alertservice-list.component.ts
#	src/app/pages/system/failover/failover.component.ts

NAS-110673 / 21.08 / Moved webdav form for add/edit functions to slide-in-panel

NAS-110843 / 21.08 / NAS-110843: Remove some any's

 Conflicts:
	src/app/pages/account/users/user-form/user-form.component.ts

NAS-110843 / 21.08 / NAS-110843 - Replacing string with enums

Removing dots

NAS-110524 / 21.08 / Fix relation issue of entity wizard

NAS-110808 / 21.08 / NAS-110808: Banning console.log

 Conflicts:
	.eslintrc.js
	src/app/core/classes/hardware/label-factory.ts
	src/app/core/classes/hardware/vdev-labels-svg.ts
	src/app/services/tour.service.ts
	src/assets/i18n/af.json
	src/assets/i18n/ar.json
	src/assets/i18n/ast.json
	src/assets/i18n/az.json
	src/assets/i18n/be.json
	src/assets/i18n/bg.json
	src/assets/i18n/bn.json
	src/assets/i18n/br.json
	src/assets/i18n/bs.json
	src/assets/i18n/ca.json
	src/assets/i18n/cy.json
	src/assets/i18n/da.json
	src/assets/i18n/de.json
	src/assets/i18n/dsb.json
	src/assets/i18n/el.json
	src/assets/i18n/en-au.json
	src/assets/i18n/en-gb.json
	src/assets/i18n/en.json
	src/assets/i18n/eo.json
	src/assets/i18n/es-co.json
	src/assets/i18n/es-mx.json
	src/assets/i18n/es-ni.json
	src/assets/i18n/es-ve.json
	src/assets/i18n/es.json
	src/assets/i18n/et.json
	src/assets/i18n/eu.json
	src/assets/i18n/fa.json
	src/assets/i18n/fi.json
	src/assets/i18n/fr.json
	src/assets/i18n/fy.json
	src/assets/i18n/ga.json
	src/assets/i18n/gd.json
	src/assets/i18n/gl.json
	src/assets/i18n/he.json
	src/assets/i18n/hi.json
	src/assets/i18n/hr.json
	src/assets/i18n/hsb.json
	src/assets/i18n/hu.json
	src/assets/i18n/ia.json
	src/assets/i18n/id.json
	src/assets/i18n/io.json
	src/assets/i18n/is.json
	src/assets/i18n/it.json
	src/assets/i18n/ja.json
	src/assets/i18n/ka.json
	src/assets/i18n/kk.json
	src/assets/i18n/km.json
	src/assets/i18n/kn.json
	src/assets/i18n/ko.json
	src/assets/i18n/lb.json
	src/assets/i18n/lt.json
	src/assets/i18n/lv.json
	src/assets/i18n/mk.json
	src/assets/i18n/ml.json
	src/assets/i18n/mn.json
	src/assets/i18n/mr.json
	src/assets/i18n/my.json
	src/assets/i18n/nb.json
	src/assets/i18n/ne.json
	src/assets/i18n/nl.json
	src/assets/i18n/nn.json
	src/assets/i18n/os.json
	src/assets/i18n/pa.json
	src/assets/i18n/pl.json
	src/assets/i18n/pt-br.json
	src/assets/i18n/pt.json
	src/assets/i18n/ro.json
	src/assets/i18n/ru.json
	src/assets/i18n/sk.json
	src/assets/i18n/sl.json
	src/assets/i18n/sq.json
	src/assets/i18n/sr-latn.json
	src/assets/i18n/sr.json
	src/assets/i18n/strings.json
	src/assets/i18n/sv.json
	src/assets/i18n/sw.json
	src/assets/i18n/ta.json
	src/assets/i18n/te.json
	src/assets/i18n/th.json
	src/assets/i18n/tr.json
	src/assets/i18n/tt.json
	src/assets/i18n/udm.json
	src/assets/i18n/uk.json
	src/assets/i18n/vi.json
	src/assets/i18n/zh-hant.json

NAS-110806 / 21.08 / NAS-110806 - Removing unused imports

NAS-110827 / 21.08 / NAS-110827 - Enabling max-len linter rule

Revert "test_NAS_T1062-fix"

test_NAS_T1062-fix

test_NAS_T1067-fix

NAS-110673

NAS-110130 / 21.06 / Fix mountpoint issue on storage page.