forked from NYANDEV/forgejo
Merge branch 'master' of localhost:xiaoxiao/gogs3
Conflicts: .gitignore README.md
This commit is contained in:
commit
11b0a97d7a
2 changed files with 4 additions and 4 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -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
|
||||
|
|
|
@ -1,6 +1,3 @@
|
|||
Gogs - Go Git Service [![wercker status](https://app.wercker.com/status/ad0bdb0bc450ac6f09bc56b9640a50aa/s/ "wercker status")](https://app.wercker.com/project/bykey/ad0bdb0bc450ac6f09bc56b9640a50aa) [![Build Status](https://drone.io/github.com/gogits/gogs/status.png)](https://drone.io/github.com/gogits/gogs/latest)
|
||||
=====================
|
||||
|
||||
Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language.
|
||||
|
||||
![Demo](http://gowalker.org/public/gogs_demo.gif)
|
||||
|
|
Loading…
Reference in a new issue