Anthony Lapenna 7f2ef8fb06 Merge branch 'develop' into demo ...

# Conflicts:
#	api/cmd/portainer/main.go

2019-07-26 14:43:10 +12:00

..

client

refactor(api): refactor base import path (#2788)

2019-03-21 14:20:14 +13:00

handler

Merge branch 'develop' into demo

2019-07-26 14:43:10 +12:00

proxy

feat(edge): introduce support for Edge agent (#3031)

2019-07-26 10:38:07 +12:00

security

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

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

server.go

feat(edge): introduce support for Edge agent (#3031)

2019-07-26 10:38:07 +12:00