Merge branch 'master' of localhost:xiaoxiao/gogs7 · bb71a1bc1d - Endevirion

Merge branch 'master' of localhost:xiaoxiao/gogs7

Conflicts:
	.gitignore

Lunny Xiao 11 years ago

parent

19b7f74b75 01b3b7004d

commit

bb71a1bc1d

1 changed files with 1 additions and 0 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 0
						
.gitignore
							 
								View File
							
				@@ -1,4 +1,5 @@
			
				+
			
				 gogs
			
				 *.exe
			
				 *.exe~