Merge branch 'origin/release-2021' into merge-2021-into-master
authorPaul Bauer <paul.bauer.q@gmail.com>
Thu, 5 Nov 2020 10:53:20 +0000 (11:53 +0100)
committerPaul Bauer <paul.bauer.q@gmail.com>
Thu, 5 Nov 2020 12:12:18 +0000 (13:12 +0100)
commit8811bd5f5897e533e43c8b993c3a5f586bf0a330
tree8c3e6b002916d32ba6ffd69745fb22f210147086
parent09dd1e79075321f629995192009f843d3c41cd44
parent4034513ca129eb03b10de937671d1b2b9557a2d8
Merge branch 'origin/release-2021' into merge-2021-into-master

Resolved Conflicts:
src/gromacs/gmxpreprocess/readir.cpp
        admin/gitlab/archive.gitlab-ci-yml
admin/gitlab-ci/archive.gitlab-ci.yml
admin/gitlab-ci/gromacs.gitlab-ci.yml
admin/gitlab-ci/lint.gitlab-ci.yml
admin/gitlab-ci/python-gmxapi.gitlab-ci.yml
admin/gitlab-ci/sample_restraint.gitlab-ci.yml
api/legacy/include/gromacs/fileio/filetypes.h
api/nblib/CMakeLists.txt
src/gromacs/CMakeLists.txt
src/gromacs/fileio/filetypes.cpp
src/programs/CMakeLists.txt
src/testutils/CMakeLists.txt