Merge branch 'release' into develop
Conflicts: manifest.appcache
This commit is contained in:
		
						commit
						c1a17a315d
					
				
					 1 changed files with 1 additions and 1 deletions
				
			
		
							
								
								
									
										2
									
								
								VERSION
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								VERSION
									
										
									
									
									
								
							|  | @ -1 +1 @@ | ||||||
| 7.0-next | 8.0.0-dev.0 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue