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