Merge branch 'master' into mononaut/acceleration-viz
This commit is contained in:
		
						commit
						c3f83f74ce
					
				
							
								
								
									
										16
									
								
								backend/package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										16
									
								
								backend/package-lock.json
									
									
									
										generated
									
									
									
								
							| @ -17,9 +17,9 @@ | |||||||
|         "crypto-js": "~4.1.1", |         "crypto-js": "~4.1.1", | ||||||
|         "express": "~4.18.2", |         "express": "~4.18.2", | ||||||
|         "maxmind": "~4.3.11", |         "maxmind": "~4.3.11", | ||||||
|         "mysql2": "~3.5.2", |         "mysql2": "~3.6.0", | ||||||
|         "rust-gbt": "file:./rust-gbt", |  | ||||||
|         "redis": "^4.6.6", |         "redis": "^4.6.6", | ||||||
|  |         "rust-gbt": "file:./rust-gbt", | ||||||
|         "socks-proxy-agent": "~7.0.0", |         "socks-proxy-agent": "~7.0.0", | ||||||
|         "typescript": "~4.9.3", |         "typescript": "~4.9.3", | ||||||
|         "ws": "~8.13.0" |         "ws": "~8.13.0" | ||||||
| @ -6102,9 +6102,9 @@ | |||||||
|       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" |       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" | ||||||
|     }, |     }, | ||||||
|     "node_modules/mysql2": { |     "node_modules/mysql2": { | ||||||
|       "version": "3.5.2", |       "version": "3.6.0", | ||||||
|       "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.5.2.tgz", |       "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.6.0.tgz", | ||||||
|       "integrity": "sha512-cptobmhYkYeTBIFp2c0piw2+gElpioga1rUw5UidHvo8yaHijMZoo8A3zyBVoo/K71f7ZFvrShA9iMIy9dCzCA==", |       "integrity": "sha512-EWUGAhv6SphezurlfI2Fpt0uJEWLmirrtQR7SkbTHFC+4/mJBrPiSzHESHKAWKG7ALVD6xaG/NBjjd1DGJGQQQ==", | ||||||
|       "dependencies": { |       "dependencies": { | ||||||
|         "denque": "^2.1.0", |         "denque": "^2.1.0", | ||||||
|         "generate-function": "^2.3.1", |         "generate-function": "^2.3.1", | ||||||
| @ -12212,9 +12212,9 @@ | |||||||
|       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" |       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" | ||||||
|     }, |     }, | ||||||
|     "mysql2": { |     "mysql2": { | ||||||
|       "version": "3.5.2", |       "version": "3.6.0", | ||||||
|       "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.5.2.tgz", |       "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.6.0.tgz", | ||||||
|       "integrity": "sha512-cptobmhYkYeTBIFp2c0piw2+gElpioga1rUw5UidHvo8yaHijMZoo8A3zyBVoo/K71f7ZFvrShA9iMIy9dCzCA==", |       "integrity": "sha512-EWUGAhv6SphezurlfI2Fpt0uJEWLmirrtQR7SkbTHFC+4/mJBrPiSzHESHKAWKG7ALVD6xaG/NBjjd1DGJGQQQ==", | ||||||
|       "requires": { |       "requires": { | ||||||
|         "denque": "^2.1.0", |         "denque": "^2.1.0", | ||||||
|         "generate-function": "^2.3.1", |         "generate-function": "^2.3.1", | ||||||
|  | |||||||
| @ -45,7 +45,7 @@ | |||||||
|     "crypto-js": "~4.1.1", |     "crypto-js": "~4.1.1", | ||||||
|     "express": "~4.18.2", |     "express": "~4.18.2", | ||||||
|     "maxmind": "~4.3.11", |     "maxmind": "~4.3.11", | ||||||
|     "mysql2": "~3.5.2", |     "mysql2": "~3.6.0", | ||||||
|     "rust-gbt": "file:./rust-gbt", |     "rust-gbt": "file:./rust-gbt", | ||||||
|     "redis": "^4.6.6", |     "redis": "^4.6.6", | ||||||
|     "socks-proxy-agent": "~7.0.0", |     "socks-proxy-agent": "~7.0.0", | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user