Skip to content
Snippets Groups Projects
Commit c5c1f95c authored by Loïc Correnson's avatar Loïc Correnson
Browse files

Merge branch 'master' into feature/wp/api

# Conflicts:
#	ivette/src/frama-c/plugins/eva/api/values/index.ts
#	src/plugins/wp/ProofEngine.mli
#	src/plugins/wp/Tactical.ml
#	src/plugins/wp/Tactical.mli
#	src/plugins/wp/gui/GuiGoal.ml
parents 8297e63e 3396bd22
No related branches found
No related tags found
No related merge requests found
Showing with 650 additions and 278 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment