Merge branch 'master' of gitlab.mpi-sws.org:FP/iris-coq

Conflicts:
	docs/program-logic.tex
1 job for master in 9 minutes and 20 seconds
Status Job ID Name Coverage
  Test
passed #1010
coq
buildjob

00:09:20