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

# Conflicts:
#	api/portainer.go

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

..

endpoint_create.go

Merge branch 'develop' into edge

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

endpoint_delete.go

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

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

endpoint_extension_add.go

feat(integrations): storidge evolution (#2711)

2019-05-25 09:53:10 +12:00

endpoint_extension_remove.go

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

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

endpoint_inspect.go

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

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

endpoint_job.go

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

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

endpoint_list.go

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

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

endpoint_snapshot.go

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

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

endpoint_snapshots.go

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

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

endpoint_update.go

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

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

handler.go

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

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