Merge branch 'master' of https://github.com/fosscord/fosscord-server
This commit is contained in:
		
						commit
						a75865a3ca
					
				| @ -62,6 +62,12 @@ | ||||
| 						} | ||||
| 					}); | ||||
| 			} | ||||
| 
 | ||||
| 			const settings = JSON.parse(localStorage.getItem("UserSettingsStore")); | ||||
| 			if (settings && settings.locale === "en") { | ||||
| 				settings.locale = "en-US"; | ||||
| 				localStorage.setItem("UserSettingsStore", JSON.stringify(settings)); | ||||
| 			} | ||||
| 		</script> | ||||
| 		<script src="/assets/479a2f1e7d625dc134b9.js"></script> | ||||
| 		<script src="/assets/a15fd133a1d2d77a2424.js"></script> | ||||
|  | ||||
| @ -89,7 +89,7 @@ function walk(dir) { | ||||
| 	var results = []; | ||||
| 	var list = fs.readdirSync(dir); | ||||
| 	list.forEach(function (file) { | ||||
| 		file = dir + "/" + file; | ||||
| 		file = path.join(dir, file); | ||||
| 		var stat = fs.statSync(file); | ||||
| 		if (stat && stat.isDirectory()) { | ||||
| 			/* Recurse into a subdirectory */ | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 uurgothat
						uurgothat