Merge branch 'master' into 'master'

Master See merge request !8

Merge branch 'master' into 'master'
Master See merge request !8
af1a5dff · LOUAZEL YOANN · 31369bcf · 6e355c1b · af1a5dff · af1a5dff
Commit af1a5dff authored 4 years ago by LOUAZEL YOANN
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 *.user
 *.userosscache
 *.sln.docstates
+/.idea.psychorientation.dir/.idea/workspace.xml

 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

--- a/psychorientation/images/perso/prof1.png
+++ b/psychorientation/images/perso/prof1.png
--- a/psychorientation/images/perso/prof2.png
+++ b/psychorientation/images/perso/prof2.png