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

Merge branch 'feature/ivette/electron' into feature/server/socket 

# Conflicts:
#	ivette/package.json
#	ivette/src/dome/main/dome.ts
#	ivette/src/dome/main/menubar.ts
#	ivette/yarn.lock
parents 8b30cd1f e6d05c0e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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