Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/development' into publications-r…
…ules # Conflicts: # src/main/java/com/epam/aidial/core/AiDial.java # src/main/java/com/epam/aidial/core/controller/AccessControlBaseController.java # src/main/java/com/epam/aidial/core/controller/ControllerSelector.java # src/main/java/com/epam/aidial/core/controller/PublicationController.java # src/main/java/com/epam/aidial/core/data/Publication.java # src/main/java/com/epam/aidial/core/data/ResourceType.java # src/main/java/com/epam/aidial/core/security/AccessService.java # src/main/java/com/epam/aidial/core/service/PublicationService.java # src/test/java/com/epam/aidial/core/PublicationApiTest.java # src/test/java/com/epam/aidial/core/ResourceBaseTest.java # src/test/java/com/epam/aidial/core/storage/ResourceDescriptionTest.java
- Loading branch information