# Conflicts:
#	dist/index.html
#	dist/static/css/app.1c29c042ca20001a6b7a701993855231.css

Feature/20200922

See merge request !61

# Conflicts:
#	dist/index.html

Dev

See merge request !60

# Conflicts:
#	dist/index.html
#	dist/static/css/app.486c5bb09435721488d99cbc7cca45c4.css

# Conflicts:
#	dist/index.html

# Conflicts:
#	dist/index.html
#	dist/static/css/app.4b2628a0607e02bb3695e4be2ada387e.css
#	dist/static/css/app.d0d081a579b1b923669a7ea9dd483616.css
#	dist/static/css/app.da2e23c2a3b49a44732ade1279731476.css

# Conflicts:
#	dist/index.html
#	src/router/index.js