mirror of
				https://github.com/gyurix1968/guacamole-client.git
				synced 2025-10-31 00:53:21 +00:00 
			
		
		
		
	Merge branch 'master' into GUAC-546-REWRITE
Conflicts: guacamole/src/main/webapp/scripts/client-ui.js
This commit is contained in:
		| @@ -10,6 +10,7 @@ | ||||
|  | ||||
|     <param name="width"           type="numeric"  title="Display width"/> | ||||
|     <param name="height"          type="numeric"  title="Display height"/> | ||||
|     <param name="dpi"             type="numeric"  title="Display resolution (DPI)"/> | ||||
|     <param name="color-depth"     type="enum" title="Color depth"> | ||||
|         <option value="8">256 color</option> | ||||
|         <option value="16">Low color (16-bit)</option> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user