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

Merge branch 'master' into feature/ivette/electron

# Conflicts:
#	ivette/headers/register.sh
parents 3500ca17 7729eb18
No related branches found
No related tags found
Loading
Showing
with 321 additions and 122 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