Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -51,6 +51,7 @@ doxygen/ | ||||
| .browse.VC.db* | ||||
| *.stackdump | ||||
| # Let these ones be user specific, since we have so many different configurations | ||||
| *.code-workspace | ||||
| .vscode/c_cpp_properties.json | ||||
| .vscode/launch.json | ||||
| .vscode/tasks.json | ||||
|   | ||||
		Reference in New Issue
	
	Block a user