Added maximum number of user persistent virtual corpora and queries
Change-Id: I6bbf17ed9cc68203908208c0bc46f81e55fe0d8a
diff --git a/full/Changes b/full/Changes
index 5ca29e5..8c18899 100644
--- a/full/Changes
+++ b/full/Changes
@@ -6,7 +6,11 @@
when it has been included in the authorization request.
- Added tests for VC sharing and for OAuth2 client using VC services
- Added and updated VC controller tests
+<<<<<<< Upstream, based on master
- Moved hibernate.properties
+=======
+- Added maximum number of user persistent virtual corpora and queries
+>>>>>>> 4db5bf8 Added maximum number of user persistent virtual corpora and queries
# version 0.69.4