tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-26 04:08:35 +00:00
Code Releases Activity

Merge branch 'master' of localhost:xiaoxiao/gogs3

Browse Source 
Conflicts:
	.gitignore
	README.md
This commit is contained in:
Lunny Xiao
2014-03-26 13:56:36 +08:00
parent 597f5ede12 b4db9f6754
commit 11b0a97d7a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -1,3 +1,4 @@
<<<<<<< HEAD
gogs
@@ -13,6 +14,8 @@ data/
*.iml
public/img/avatar/
=======
>>>>>>> b4db9f67548a41922f1b337daf9c9d2b975b55c4
# Compiled Object files, Static and Dynamic libs (Shared Objects)
*.o
*.a