Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-23 15:29:42 +02:00
Code Issues Releases Activity

merge branch 'feat107-push-registry' into internal

Browse source
This commit is contained in:
Anthony Lapenna 2016-08-17 12:32:09 +12:00
commit 9c8e632a09
5 changed files with 38 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
api/main.go
View file

@ -38,7 +38,10 @@ func main() {
settings := &Settings{
Swarm: *swarm,
HiddenLabels: *labels,
<<<<<<< HEAD
Registries: *registries,
=======
>>>>>>> feat107-push-registry
Logo: *logo,
}