Olivier Massot 411046ac32 fix merge conflicts 2 gadi atpakaļ
..
Creation.vue 411046ac32 fix merge conflicts 2 gadi atpakaļ
Edition.vue 411046ac32 fix merge conflicts 2 gadi atpakaļ