Merge branch 'develop'

Author: snipe

app/Services/Saml.php

@@ -163,6 +163,7 @@ private function loadSettings()
             OneLogin_Saml2_Utils::setProxyVars(request()->isFromTrustedProxy());
 
             data_set($settings, 'sp.entityId', config('app.url'));
+            data_set($settings, 'baseurl', config('app.url') . '/saml');
             data_set($settings, 'sp.assertionConsumerService.url', route('saml.acs'));
             data_set($settings, 'sp.singleLogoutService.url', route('saml.sls'));
             data_set($settings, 'sp.x509cert', $setting->saml_sp_x509cert);

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v7.0.5',
-  'full_app_version' => 'v7.0.5 - build 14092-g294fb1f77',
-  'build_version' => '14092',
+  'app_version' => 'v7.0.6',
+  'full_app_version' => 'v7.0.6 - build 14112-ge1a6b441d',
+  'build_version' => '14112',
   'prerelease_version' => '',
-  'hash_version' => 'g294fb1f77',
-  'full_hash' => 'v7.0.5-77-g294fb1f77',
+  'hash_version' => 'ge1a6b441d',
+  'full_hash' => 'v7.0.6-6-ge1a6b441d',
   'branch' => 'master',
 );