Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						08c1c045f9
					
				
					 2 changed files with 2 additions and 4 deletions
				
			
		| 
						 | 
				
			
			@ -119,8 +119,7 @@
 | 
			
		|||
            "solid_reactive_multinexus": true,
 | 
			
		||||
            "solid_splash": true,
 | 
			
		||||
            "wave_left_right": true,
 | 
			
		||||
            "wave_up_down": true,
 | 
			
		||||
            "effect_max": true
 | 
			
		||||
            "wave_up_down": true
 | 
			
		||||
        },
 | 
			
		||||
        "layout": [
 | 
			
		||||
            {"matrix":[0, 0],  "flags":1, "x":0,   "y":0},
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -136,8 +136,7 @@
 | 
			
		|||
            "solid_reactive_multinexus": true,
 | 
			
		||||
            "solid_splash": true,
 | 
			
		||||
            "wave_left_right": true,
 | 
			
		||||
            "wave_up_down": true,
 | 
			
		||||
            "effect_max": true
 | 
			
		||||
            "wave_up_down": true
 | 
			
		||||
        },
 | 
			
		||||
        "layout": [
 | 
			
		||||
            {"matrix":[0, 0],  "flags":1, "x":0,   "y":0},
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue