Commit Graph

4 Commits

Author SHA1 Message Date
Wenkai Yin
4ef5c1f98a Merge master into dev
Conflicts:
	.travis.yml
	Dockerfile.job
	vendor/vendor.json
2016-08-15 11:30:06 +08:00
Tan Jiang
3f26bca5ed rebuild vendor directory 2016-08-12 14:50:00 +08:00
Tan Jiang
a3b4b1b525 enable redis for ui session 2016-07-22 16:03:09 +08:00
Tan Jiang
1ba3a822d4 upgrade beego to 1.6.1 2016-06-27 17:38:50 +08:00