Olivier Massot 411046ac32 fix merge conflicts 2 rokov pred
..
Creation.vue 411046ac32 fix merge conflicts 2 rokov pred
Edition.vue 411046ac32 fix merge conflicts 2 rokov pred