Merge branch 'master' into feature/PRXS-1380-AddMetadataToSchema (f2c4ed8f) · Commits · perxis / perxis-go · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

perxis-go
- Activity
- Members
- Package Registry
- Terraform modules
- Contributor analytics
- Model experiments

Snippets Groups Projects

f2c4ed8f

Commit f2c4ed8f authored 1 year ago by ko_oler

Downloads
- Plain Diff

Merge branch 'master' into feature/PRXS-1380-AddMetadataToSchema

# Conflicts:
#	pkg/setup/collection_test.go

parents 21c8e2d7 fc5fc35e

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

pkg/extension/extension.go 0 additions, 2 deletions

pkg/extension/extension.go
pkg/schema/schema.go 3 additions, 20 deletions

pkg/schema/schema.go
pkg/schema/schema_json.go 13 additions, 5 deletions

pkg/schema/schema_json.go
pkg/schema/test/object_test.go 0 additions, 3 deletions

pkg/schema/test/object_test.go
pkg/setup/collection.go 5 additions, 7 deletions

pkg/setup/collection.go
pkg/setup/collection_test.go 0 additions, 2 deletions

pkg/setup/collection_test.go

with 21 additions and 39 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment