Anthony Lapenna 2cabfd574c Merge branch 'develop' into edge ...

# Conflicts:
#	api/portainer.go

2019-05-27 11:29:35 +12:00

..

handler.go

fix(rbac): add specific authorization for Storidge management

2019-05-27 10:41:12 +12:00

proxy_azure.go

feat(extensions): introduce RBAC extension (#2900)

2019-05-24 18:04:58 +12:00

proxy_docker.go

Merge branch 'develop' into edge

2019-05-27 11:29:35 +12:00

proxy_storidge.go

fix(rbac): add specific authorization for Storidge management

2019-05-27 10:41:12 +12:00