Merge branch 'master' into preferences

This commit is contained in:
Torkel Ödegaard
2016-03-20 11:27:49 +01:00
286 changed files with 109154 additions and 283 deletions
+1
View File
@@ -69,6 +69,7 @@ func AddDataSource(cmd *m.AddDataSourceCommand) error {
BasicAuth: cmd.BasicAuth,
BasicAuthUser: cmd.BasicAuthUser,
BasicAuthPassword: cmd.BasicAuthPassword,
WithCredentials: cmd.WithCredentials,
JsonData: cmd.JsonData,
Created: time.Now(),
Updated: time.Now(),