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

Merge branch 'master' into feature/ivette/properties-filter

# Conflicts:
#	ivette/src/renderer/Properties.tsx
parents daaa9e66 451a840d
No related branches found
No related tags found
No related merge requests found
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