Merge branch 'master' into yvan

2 years ago · 5a648612d4
parent 30da9d3dbd 6759cfb65c
commit 5a648612d4
1 changed files with 1 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -10,6 +10,7 @@ templatesTest/
 # User-specific files
 *.rsuser
 *.suo
+.suo
 *.user
 *.userosscache
 *.sln.docstates