Merge branch 'master' of try.gogits.org:lunny/gogs
Conflicts: .gitignore LICENSE
This commit is contained in:
		
						commit
						5bfad6867d
					
				
					 2 changed files with 48 additions and 17 deletions
				
			
		
							
								
								
									
										25
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										25
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -9,4 +9,27 @@ data/
 | 
			
		|||
.vendor/
 | 
			
		||||
.idea/
 | 
			
		||||
*.iml
 | 
			
		||||
public/img/avatar/
 | 
			
		||||
public/img/avatar/
 | 
			
		||||
 | 
			
		||||
# Compiled Object files, Static and Dynamic libs (Shared Objects)
 | 
			
		||||
*.o
 | 
			
		||||
*.a
 | 
			
		||||
*.so
 | 
			
		||||
 | 
			
		||||
# Folders
 | 
			
		||||
_obj
 | 
			
		||||
_test
 | 
			
		||||
 | 
			
		||||
# Architecture specific extensions/prefixes
 | 
			
		||||
*.[568vq]
 | 
			
		||||
[568vq].out
 | 
			
		||||
 | 
			
		||||
*.cgo1.go
 | 
			
		||||
*.cgo2.c
 | 
			
		||||
_cgo_defun.c
 | 
			
		||||
_cgo_gotypes.go
 | 
			
		||||
_cgo_export.*
 | 
			
		||||
 | 
			
		||||
_testmain.go
 | 
			
		||||
 | 
			
		||||
*.exe
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue