Merge branch 'stable-1.0' into stable-1.1
This commit is contained in:
		
							
								
								
									
										2
									
								
								.gitmodules
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.gitmodules
									
									
									
									
										vendored
									
									
								
							@@ -128,7 +128,7 @@
 | 
				
			|||||||
	branch = nalc
 | 
						branch = nalc
 | 
				
			||||||
[submodule "hbarmor"]
 | 
					[submodule "hbarmor"]
 | 
				
			||||||
	path = hbarmor
 | 
						path = hbarmor
 | 
				
			||||||
	url = https://sys4.fr/gitea/nalc/hbarmor.git
 | 
						url = https://sys4.fr/gitea/nalc/minetest_hbarmor.git
 | 
				
			||||||
	branch = nalc
 | 
						branch = nalc
 | 
				
			||||||
[submodule "hbhunger"]
 | 
					[submodule "hbhunger"]
 | 
				
			||||||
	path = hbhunger
 | 
						path = hbhunger
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user