Skip to content
Snippets Groups Projects
Commit 7f871bb4 authored by Alena Petraki's avatar Alena Petraki
Browse files

Merge branch 'feature/PRXS-1674-ExtensionsUpdateCollectionStrategy' into... 

Merge branch 'feature/PRXS-1674-ExtensionsUpdateCollectionStrategy' into feature/PRXS-1619-AsyncSyncMethods

# Conflicts:
#	pkg/extension/extension.go
parents 1526cbbb 1e620e6d
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
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