tree a2284769d9057a46cf2ec79db5aef6bddac81db1
parent 3489cc14333e023bfe55a0f0cc08e47f7b6ac75b
parent 085e94f4f705189d987a820f494cbc33c281b7fb
author Mateusz Starzyk <mateusz.starzyk@mobica.com> 1621513092 +0200
committer Mateusz Starzyk <mateusz.starzyk@mobica.com> 1621513092 +0200

Merge branch 'development' into convert_NO_SHA384_to_positive

Conflicts:
	library/version_features.c
	programs/test/query_config.c

Files were removed in development branch and modified by current branch.
Conflicts fixes by removing them.