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

Conflicts:
	barrier/barrier.v
1 job for master
Status Job ID Name Coverage
  Test
passed #84
coq
buildjob

00:03:46