Merge branch 'release/4.3.6'

.travis.yml

@@ -21,3 +21,9 @@ install:
 
 script:
   - phpunit
+
+# safelist
+branches:
+  only:
+  - develop
+  - master

CHANGELOG.md

@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+
+## [4.3.6] - 2017-02-20
+### Fixed
+- #578, reported by [xpfgsyb](https://github.com/xpfgsyb).
+
 ## [4.3.5] - 2017-02-19
 ### Added
 - Beta support for Sandstorm.IO

app/Providers/AppServiceProvider.php

@@ -39,7 +39,7 @@ class AppServiceProvider extends ServiceProvider
 
         // force https urls
         if (env('APP_FORCE_SSL', false)) {
-            URL::forceSchema('https');
+            URL::forceScheme('https');
         }
     }
 

config/firefly.php

@@ -24,7 +24,7 @@ return [
     ],
     'encryption'          => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true),
     'chart'               => 'chartjs',
-    'version'             => '4.3.5',
+    'version'             => '4.3.6',
     'csv_import_enabled'  => true,
     'maxUploadSize'       => 5242880,
     'allowedMimes'        => ['image/png', 'image/jpeg', 'application/pdf'],