mcrakhman
|
3cbdf798a2
|
Merge branch 'drpc-services' into space-sync
# Conflicts:
# Makefile
# cmd/node/node.go
# pkg/acl/aclchanges/aclpb/aclchanges.pb.go
# pkg/acl/acltree/aclstatebuilder.go
# pkg/acl/acltree/change.go
# pkg/acl/example/plaintextdocument/document.go
# pkg/acl/example/plaintextdocument/plaintextdocstate.go
# pkg/acl/list/aclstate.go
# pkg/acl/list/changebuilder.go
# pkg/acl/testutils/testchanges/proto/test.pb.go
# pkg/acl/testutils/treestoragebuilder/treestoragebuilder.go
# pkg/acl/testutils/treestoragebuilder/treestoragebuildergraph_nix.go
# pkg/acl/tree/treegraph_nix.go
# service/document/service.go
# service/space/service.go
# service/space/space.go
# service/sync/requesthandler/requesthandler.go
# service/treecache/service.go
# syncproto/helpers.go
# syncproto/sync.pb.go
|
2022-09-11 15:36:38 +02:00 |
|
