lichengyin a899320f19 Merge branch 'master' into 2.1 ...

* master:
  release 2.0.15
  fix error in nunjucks template, add tests
  fix error in nunjucks template
  release 2.0.14

Conflicts:
	src/adapter/template/nunjucks.js

2015-12-25 17:39:37 +08:00

..

cache

fix windows test error

2015-12-17 16:10:40 +08:00

db

fix windows test error

2015-12-17 20:05:38 +08:00

session

fix windows test error

2015-12-17 20:05:38 +08:00

socket

Merge branch 'master' into 2.1

2015-12-24 17:39:08 +08:00

store

fix windows test error

2015-12-17 20:05:38 +08:00

template

Merge branch 'master' into 2.1

2015-12-25 17:39:37 +08:00

websocket

fix windows test error

2015-12-17 20:05:38 +08:00

base.js

fix windows test error

2015-12-17 20:05:38 +08:00