Merge remote-tracking branch 'origin/master' into feature/update_documentation
authorPepijn Noltes <pnoltes@apache.org>
Thu, 10 Mar 2022 07:57:42 +0000 (08:57 +0100)
committerPepijn Noltes <pnoltes@apache.org>
Thu, 10 Mar 2022 07:57:42 +0000 (08:57 +0100)
commitfee8bdb4565344dec4ae7428e39f0cb7c34e9eda
treefcab82e45d17ffe2f3959c5bef7801a898320ef3
parent66ca65c175abe9e9945b2ff5b055c2a77e048afe
parent3b651daecc2e61cdcc00419cd537b5ec986a2472
Merge remote-tracking branch 'origin/master' into feature/update_documentation

# Conflicts:
# examples/CMakeLists.txt
examples/CMakeLists.txt
libs/framework/include/celix_bundle_context.h