Merge branch 'release/1.0' into develop
Merge branch 'hotfix/fix-products' into develop
Merge branch 'hotfix/product-fix2' into develop
Merge branch 'hotfix/about' into develop
finishing the feature
fixing the feature
finishing frigga3
done with the release
Merge branch 'release/1.0.1'