Skip to content
Snippets Groups Projects
Commit 930bef16 authored by ko_oler's avatar ko_oler
Browse files

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

# Conflicts:
#	proto/collections/collections.proto
parents 2bca07bb be32bb9e
No related branches found
No related tags found
1 merge request!29Обновлены названия полей для Rules и Colleсtions.Acess
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment