Wenkai Yin 414e8a8bcf Merge remote-tracking branch 'upstream/dev' into 170224_merge_config ... Conflicts: make/docker-compose.tpl src/ui/service/token/authutils.go		2017-02-24 13:52:19 +08:00
..
db	change code 20161019	2016-10-21 18:39:10 +08:00
log	log rotate	2016-10-26 18:26:02 +08:00
templates	Merge remote-tracking branch 'upstream/dev' into 170224_merge_config	2017-02-24 13:52:19 +08:00