diff options
| author | Justin Nuß <nuss.justin@gmail.com> | 2014-07-26 11:23:58 +0200 |
|---|---|---|
| committer | Justin Nuß <nuss.justin@gmail.com> | 2014-07-26 11:23:58 +0200 |
| commit | 91480f3791f266369c343c539f8eeec245fa969a (patch) | |
| tree | a03ad6062fe4b546367cdb6f9921399458d97441 /.gitignore | |
| parent | 835e85b5ce9921ffd4d50b90b706e02685167331 (diff) | |
| parent | 35c75f06a0a4f321021984830d760e67ca0ef8e5 (diff) | |
| download | gitea-91480f3791f266369c343c539f8eeec245fa969a.tar.gz gitea-91480f3791f266369c343c539f8eeec245fa969a.zip | |
Merge branch 'dev' of https://github.com/gogits/Gogs into issue/281
Conflicts:
modules/base/tool.go
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 865f77c634..ac88d5ca1a 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ gogs __pycache__ *.pem output* +config.codekit |