Merge pull request #218 from StuartWheater/master

Revert to '6.0.0' and 'master'

Author: StuartWheater

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: dsBaseClient
 Title: DataSHIELD Client Functions
-Version: 6.1.0
+Version: 6.0.0
 Author: DataSHIELD Developers <datashield@newcastle.ac.uk>
 Maintainer: DataSHIELD Developers <datashield@newcastle.ac.uk>
 Description: DataSHIELD client functions for the client side.

azure-pipelines_site.pp

@@ -16,7 +16,7 @@
   remote_mysql   => false,        # There is not a remote mysql server
 
   dsbase_githubusername      => 'datashield',
-  dsbase_ref                 => 'v6.1-dev',
+  dsbase_ref                 => 'master',
   dsstats_githubusername     => 'datashield',
   dsstats_ref                => '',
   dsgraphics_githubusername  => 'datashield',