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

Merge branch 'master' into feature/server/plugin 

# Conflicts:
#	src/plugins/gui/pretty_source.ml
parents 4bf2c145 250e6a8a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 360 additions and 214 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment