Merge remote-tracking branch 'origin/master' into feature/update_documentation
authorPepijn Noltes <pnoltes@apache.org>
Sun, 10 Apr 2022 08:21:31 +0000 (10:21 +0200)
committerPepijn Noltes <pnoltes@apache.org>
Sun, 10 Apr 2022 08:21:31 +0000 (10:21 +0200)
commit01b4e67413ba1fc61f205b7ae4783404a9783a14
treef16b94a6f644b87786d7778e7af8704e90dd1514
parent4ef7b466c7a0add96597e4aa7bd3ee4f8ccb6fed
parent878791aff932b6b0ec55f3b8dbd691664bffa458
Merge remote-tracking branch 'origin/master' into feature/update_documentation

# Conflicts:
# CMakeLists.txt
# libs/utils/CMakeLists.txt
.github/workflows/ubuntu.yml
CMakeLists.txt
examples/CMakeLists.txt
examples/celix-examples/CMakeLists.txt