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
..
env	Merge remote-tracking branch 'upstream/dev' into 161228_config	2017-01-12 17:41:14 +08:00