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

This commit is contained in:
Unknwon 2015-10-21 06:40:56 -04:00
commit eac91a74d8
3 changed files with 5 additions and 3 deletions

View file

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

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