test1234
/
gitea
forked from gitea/gitea
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'develop' of github.com:gogits/gogs into develop

This commit is contained in:
Unknwon 2015-10-21 06:40:56 -04:00
parent f17b746a01 d3f67d341f
commit eac91a74d8
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gopmfile
View File

@ -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

2
modules/setting/setting_memcache.go
View File

@ -7,7 +7,7 @@
package setting
import (
_ "github.com/macaron-contrib/cache/memcache"
_ "github.com/go-macaron/cache/memcache"
)
func init() {

4
modules/setting/setting_redis.go
View File

@ -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() {