Merge branch 'master' of localhost:xiaoxiao/gogs7
Conflicts: .gitignore
This commit is contained in:
		
						commit
						bb71a1bc1d
					
				
					 1 changed files with 1 additions and 0 deletions
				
			
		
							
								
								
									
										1
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -1,4 +1,5 @@
 | 
			
		|||
 | 
			
		||||
 | 
			
		||||
gogs
 | 
			
		||||
*.exe
 | 
			
		||||
*.exe~
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue