Merge branch 'master' into v2-master-merge

This commit is contained in:
Ajitem Sahasrabuddhe
2019-09-16 12:16:28 +05:30
14 changed files with 73 additions and 54 deletions

View File

@@ -1,8 +1,3 @@
// Disabling building of toml support in cases where golang is 1.0 or 1.1
// as the encoding library is not implemented or supported.
// +build go1.2
package altsrc
import (