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

Merge branch 'master' into feature/ivette/tip

# Conflicts:
#	src/plugins/wp/VCS.ml
#	src/plugins/wp/Why3Provers.ml
parents f5dadf55 fed29670
No related branches found
No related tags found
Loading
Showing
with 321 additions and 162 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