Wenkai Yin 75f660fa77 Merge remote-tracking branch 'upstream/dev' into 161228_config ... Conflicts: make/common/templates/ui/env src/ui/auth/ldap/ldap.go src/ui/config/config.go		2017-01-12 17:41:14 +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 161228_config	2017-01-12 17:41:14 +08:00