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

@@ -3,9 +3,9 @@ package resolvers
import (
"context"
"github.com/photoview/photoview/api/graphql/auth"
"github.com/photoview/photoview/api/graphql/models"
"github.com/pkg/errors"
"github.com/viktorstrate/photoview/api/graphql/auth"
"github.com/viktorstrate/photoview/api/graphql/models"
"golang.org/x/crypto/bcrypt"
"gorm.io/gorm"
)