mirror of
				https://github.com/vector-im/element-web.git
				synced 2025-11-04 10:11:03 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
		
						commit
						45b180e476
					
				
							
								
								
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@ -14,3 +14,6 @@ npm-debug.log
 | 
			
		||||
/src/component-index.js
 | 
			
		||||
 | 
			
		||||
.DS_Store
 | 
			
		||||
 | 
			
		||||
# https://github.com/vector-im/riot-web/issues/7083
 | 
			
		||||
package-lock.json
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										6960
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										6960
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user