chore: move to Traefik organization.

Co-authored-by: Romain <rtribotte@users.noreply.github.com>
This commit is contained in:
Jean-Baptiste Doumenjou 2020-09-16 15:46:04 +02:00 committed by GitHub
parent 9df89e66e3
commit c0f1e74bed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
421 changed files with 5213 additions and 5234 deletions

View file

@ -1,10 +1,10 @@
package server
import (
"github.com/containous/traefik/v2/pkg/config/dynamic"
"github.com/containous/traefik/v2/pkg/log"
"github.com/containous/traefik/v2/pkg/server/provider"
"github.com/containous/traefik/v2/pkg/tls"
"github.com/traefik/traefik/v2/pkg/config/dynamic"
"github.com/traefik/traefik/v2/pkg/log"
"github.com/traefik/traefik/v2/pkg/server/provider"
"github.com/traefik/traefik/v2/pkg/tls"
)
func mergeConfiguration(configurations dynamic.Configurations, defaultEntryPoints []string) dynamic.Configuration {