| 
							
							
								 Eric Lippmann | 7c8e9e6f56 | CLI/Webserver Setup: Rename webPath to urlPath This is how the apache docs call it. Nginx speaks of uri.
refs #6120 | 2014-11-13 14:18:14 +01:00 |  | 
			
				
					| 
							
							
								 Eric Lippmann | 459fc77fc7 | CLI/Webserver Setup: Allow to define Icinga Web 2's configuration directory refs #6120 | 2014-11-13 14:05:13 +01:00 |  | 
			
				
					| 
							
							
								 Eric Lippmann | 8594dc068a | CLI/Webserver Setup: Rename publicPath to documentRoot refs #6120 | 2014-11-13 13:17:59 +01:00 |  | 
			
				
					| 
							
							
								 Eric Lippmann | 2ad2127ae3 | Merge branch 'master' into feature/generate-webserver-config-6120 Conflicts:
	application/clicommands/SetupCommand.php | 2014-11-13 12:50:55 +01:00 |  |