Skip to content
Snippets Groups Projects
Commit 9785e683 authored by François Agneray's avatar François Agneray
Browse files

Merge branch 'develop' into '90-documentation-construction-url-serveur' 

# Conflicts:
#   src/settings/settings.ts
parents 3c3968cf afed17c1
No related branches found
No related tags found
2 merge requests!113Develop,!99Resolve "Documentation construction url serveur"
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 0 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