Merge branch 'click-helper' into 'master'

[click_helper][ResourceOption] Improvements

See merge request !115
5 jobs for master in 10 minutes and 32 seconds (queued for 6 seconds)
Status Job ID Name Coverage
  Build
passed #202663
docker
build_linux_36

00:03:11

73.0%
passed #202664
docker
build_linux_37

00:03:11

73.0%
passed #202661
macosx
build_macosx_36

00:08:30

74.0%
passed #202662
macosx
build_macosx_37

00:08:59

74.0%
 
  Deploy
passed #202665
docker
deploy_beta

00:01:32