Commit 82ca2d04 authored by Jacques-Henri Jourdan's avatar Jacques-Henri Jourdan

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

Conflicts:
	docs/program-logic.tex
parents 0bd43b95 a0cf8fc5
Pipeline #2825 passed with stage
in 9 minutes and 20 seconds