Skip to content
Snippets Groups Projects
Commit 05402c16 authored by ko_oler's avatar ko_oler
Browse files

Merge branch 'master' into feature/PRXS-1726-RulesFieldsChangeNames

# Conflicts:
#	perxis-proto
#	pkg/spaces/service.go
parents 90684265 2a0c0154
No related branches found
No related tags found
No related merge requests found
Showing
with 195 additions and 170 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 to comment