mirror of
				https://github.com/gyurix1968/guacamole-client.git
				synced 2025-11-04 11:03:21 +00:00 
			
		
		
		
	Merge 1.1.0 changes to master.
This commit is contained in:
		@@ -19,8 +19,9 @@
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Controller for time zone fields. Time zone fields use Java IDs as the
 | 
			
		||||
 * standard representation for each supported time zone.
 | 
			
		||||
 * Controller for time zone fields. Time zone fields use IANA time zone
 | 
			
		||||
 * database identifiers as the standard representation for each supported time
 | 
			
		||||
 * zone. These identifiers are also legal Java time zone IDs.
 | 
			
		||||
 */
 | 
			
		||||
angular.module('form').controller('timeZoneFieldController', ['$scope', '$injector',
 | 
			
		||||
    function timeZoneFieldController($scope, $injector) {
 | 
			
		||||
@@ -418,7 +419,6 @@ angular.module('form').controller('timeZoneFieldController', ['$scope', '$inject
 | 
			
		||||
        "Canada" : {
 | 
			
		||||
            "Atlantic"          : "Canada/Atlantic",
 | 
			
		||||
            "Central"           : "Canada/Central",
 | 
			
		||||
            "East-Saskatchewan" : "Canada/East-Saskatchewan",
 | 
			
		||||
            "Eastern"           : "Canada/Eastern",
 | 
			
		||||
            "Mountain"          : "Canada/Mountain",
 | 
			
		||||
            "Newfoundland"      : "Canada/Newfoundland",
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user