homelab/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch v2.3 into master

Browse source
This commit is contained in:
Fernandez Ludovic 2020-09-17 12:06:57 +02:00
commit 86c099d629
440 changed files with 5538 additions and 5466 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkg/server/aggregator_test.go
View file

@ -3,9 +3,9 @@ package server
import (
"testing"
"github.com/containous/traefik/v2/pkg/config/dynamic"
"github.com/containous/traefik/v2/pkg/tls"
"github.com/stretchr/testify/assert"
"github.com/traefik/traefik/v2/pkg/config/dynamic"
"github.com/traefik/traefik/v2/pkg/tls"
)
func Test_mergeConfiguration(t *testing.T) {