Commit d7c55ad3 authored by Nala Ginrut's avatar Nala Ginrut

Merge branch '09-06-2018' into 'master'

New changes on 09-06-2018

See merge request !96
parents 19635f46 250a5e73
Pipeline #29983520 passed with stage
in 23 minutes and 36 seconds