Skip to content
Snippets Groups Projects
Commit f224fac7 authored by Pavel Antonov's avatar Pavel Antonov :asterisk:
Browse files

Merge branch 'refs/heads/master' into 1-auth 

# Conflicts:
#	pkg/auth/anonymous.go
#	pkg/auth/client.go
#	pkg/auth/system.go
#	pkg/spaces/service.go
parents 2537bca0 e58fe356
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 216 additions and 98 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment