diff options
| author | Unknwon <u@gogs.io> | 2015-10-21 06:40:56 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-10-21 06:40:56 -0400 |
| commit | eac91a74d87fcd9cfa38fcc9fb67af709a8e7a42 (patch) | |
| tree | 045b66a12314e3bc41e4471d23e734fd00148723 | |
| parent | f17b746a01a6edfc0ad350116313d92c27557f16 (diff) | |
| parent | d3f67d341f30bb0717e4a8c53eccba6c58a44608 (diff) | |
| download | gitea-eac91a74d87fcd9cfa38fcc9fb67af709a8e7a42.tar.gz gitea-eac91a74d87fcd9cfa38fcc9fb67af709a8e7a42.zip | |
Merge branch 'develop' of github.com:gogits/gogs into develop
| -rw-r--r-- | .gopmfile | 2 | ||||
| -rw-r--r-- | modules/setting/setting_memcache.go | 2 | ||||
| -rw-r--r-- | modules/setting/setting_redis.go | 4 |
3 files changed, 5 insertions, 3 deletions
@@ -24,6 +24,8 @@ github.com/go-macaron/i18n = github.com/go-macaron/session = github.com/go-macaron/toolbox = github.com/klauspost/compress = +github.com/klauspost/crc32 = +github.com/klauspost/cpuid = github.com/mattn/go-sqlite3 = commit:b808f01f66 github.com/mcuadros/go-version = commit:d52711f8d6 github.com/microcosm-cc/bluemonday = commit:85ba47ef2c diff --git a/modules/setting/setting_memcache.go b/modules/setting/setting_memcache.go index 26b1cc6f60..9a7653b726 100644 --- a/modules/setting/setting_memcache.go +++ b/modules/setting/setting_memcache.go @@ -7,7 +7,7 @@ package setting import ( - _ "github.com/macaron-contrib/cache/memcache" + _ "github.com/go-macaron/cache/memcache" ) func init() { diff --git a/modules/setting/setting_redis.go b/modules/setting/setting_redis.go index bfd1694de3..e12010cd59 100644 --- a/modules/setting/setting_redis.go +++ b/modules/setting/setting_redis.go @@ -7,8 +7,8 @@ package setting import ( - _ "github.com/macaron-contrib/cache/redis" - _ "github.com/macaron-contrib/session/redis" + _ "github.com/go-macaron/cache/redis" + _ "github.com/go-macaron/session/redis" ) func init() { |