Merge branch 'master' of https://git.zyuas.com/DJI/shangyun · ab1779f742 - Gogs

Merge branch 'master' of https://git.zyuas.com/DJI/shangyun

# Conflicts:
#	Web/.gitignore

Ryuiso 1 year ago

parent

de785a3f8f 7137f85a7a

commit

ab1779f742

1 changed files with 2 additions and 1 deletions

Split View Show Diff Stats

						
							+ 2
							
							- 1
						
Web/.gitignore
							 
								View File
							
				@@ -14,4 +14,5 @@ node_modules
			
				 /dist
			
				 # 配置文件
			
				-.env.development
			
				+.env.development
			
				+