Merge branch 'master' into v2.0.0

This commit is contained in:
viktorstrate
2020-12-17 23:18:00 +01:00
38 changed files with 197 additions and 235 deletions

View File

@@ -4,9 +4,9 @@ import (
"context"
"time"
"github.com/photoview/photoview/api/graphql/models"
"github.com/photoview/photoview/api/scanner"
"github.com/pkg/errors"
"github.com/viktorstrate/photoview/api/graphql/models"
"github.com/viktorstrate/photoview/api/scanner"
"gorm.io/gorm"
)