mirror of
				https://github.com/vector-im/element-web.git
				synced 2025-11-04 02:02:14 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
		
						commit
						b40bc8ff8c
					
				@ -123,16 +123,16 @@
 | 
				
			|||||||
    "expect": "^1.16.0",
 | 
					    "expect": "^1.16.0",
 | 
				
			||||||
    "flow-parser": "^0.57.3",
 | 
					    "flow-parser": "^0.57.3",
 | 
				
			||||||
    "json-loader": "^0.5.3",
 | 
					    "json-loader": "^0.5.3",
 | 
				
			||||||
    "karma": "^1.7.0",
 | 
					    "karma": "^3.0.0",
 | 
				
			||||||
    "karma-chrome-launcher": "^0.2.3",
 | 
					    "karma-chrome-launcher": "^0.2.3",
 | 
				
			||||||
    "karma-cli": "^0.1.2",
 | 
					    "karma-cli": "^0.1.2",
 | 
				
			||||||
    "karma-junit-reporter": "^0.4.1",
 | 
					    "karma-junit-reporter": "^1.2.0",
 | 
				
			||||||
    "karma-logcapture-reporter": "0.0.1",
 | 
					    "karma-logcapture-reporter": "0.0.1",
 | 
				
			||||||
    "karma-mocha": "^0.2.2",
 | 
					    "karma-mocha": "^0.2.2",
 | 
				
			||||||
    "karma-sourcemap-loader": "^0.3.7",
 | 
					    "karma-sourcemap-loader": "^0.3.7",
 | 
				
			||||||
    "karma-spec-reporter": "^0.0.31",
 | 
					    "karma-spec-reporter": "^0.0.31",
 | 
				
			||||||
    "karma-summary-reporter": "^1.3.3",
 | 
					    "karma-summary-reporter": "^1.3.3",
 | 
				
			||||||
    "karma-webpack": "^1.7.0",
 | 
					    "karma-webpack": "^3.0.5",
 | 
				
			||||||
    "matrix-mock-request": "^1.2.1",
 | 
					    "matrix-mock-request": "^1.2.1",
 | 
				
			||||||
    "matrix-react-test-utils": "^0.1.1",
 | 
					    "matrix-react-test-utils": "^0.1.1",
 | 
				
			||||||
    "mocha": "^5.0.5",
 | 
					    "mocha": "^5.0.5",
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user