Alexander Belanger ff3cc08729 fix merge conflicts 5 éve
..
helpers_test.go ff3cc08729 fix merge conflicts 5 éve
rotate.go 4e39df7def add migration option for vault 5 éve
rotate_test.go 4e39df7def add migration option for vault 5 éve