Merge branch 'master' into v2-master-merge

2019-09-16 12:16:28 +05:30
parent b161244b73 c71fbcefd2
commit a9d5b68df5
14 changed files with 73 additions and 54 deletions
--- a/altsrc/flag_generated.go
+++ b/altsrc/flag_generated.go
@@ -1,3 +1,5 @@
+// Code generated by fg; DO NOT EDIT.
+
 package altsrc

 import (