diff options
| author | Unknwon <joe2010xtmf@163.com> | 2014-08-31 15:11:55 +0800 |
|---|---|---|
| committer | Unknwon <joe2010xtmf@163.com> | 2014-08-31 15:11:55 +0800 |
| commit | 7e36bf448db915250eb831a00b122fc1092df630 (patch) | |
| tree | f3e590a542497efd1908109f752e7a03a8abeca4 /.gopmfile | |
| parent | d78008b546b74d528629b79a7fee00b20f3437e2 (diff) | |
| parent | 03c6a395aa0d32c99e8264d18a3b5228656478df (diff) | |
| download | gitea-7e36bf448db915250eb831a00b122fc1092df630.tar.gz gitea-7e36bf448db915250eb831a00b122fc1092df630.zip | |
Merge branch 'master' of github.com:gogits/gogs into dev
Conflicts:
dockerfiles/README.md
Diffstat (limited to '.gopmfile')
| -rw-r--r-- | .gopmfile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -2,6 +2,7 @@ path = github.com/gogits/gogs [deps] +code.google.com/p/mahonia = github.com/Unknwon/cae = github.com/Unknwon/com = github.com/Unknwon/goconfig = @@ -20,9 +21,10 @@ github.com/macaron-contrib/cache = github.com/macaron-contrib/captcha = github.com/macaron-contrib/csrf = github.com/macaron-contrib/i18n = -github.com/macaron-contrib/session = +github.com/macaron-contrib/session = github.com/macaron-contrib/toolbox = github.com/nfnt/resize = +github.com/saintfish/chardet = [res] include = conf|etc|public|scripts|templates |