Merge remote-tracking branch 'origin/develop'

.env.example

@@ -23,7 +23,7 @@ DB_DUMP_PATH='/usr/bin'
 # --------------------------------------------
 # OPTIONAL: SSL DATABASE SETTINGS
 # --------------------------------------------
-DB_SSL=true
+DB_SSL=false
 DB_SSL_KEY_PATH=null
 DB_SSL_CERT_PATH=null
 DB_SSL_CA_PATH=null

app/Http/Controllers/AssetModelsController.php

@@ -145,7 +145,7 @@ class AssetModelsController extends Controller
         $model->category_id = e(Input::get('category_id'));
         $model->model_number = e(Input::get('model_number'));
         $model->user_id = Auth::user()->id;
-        $model->note            = e(Input::get('note'));
+        $model->notes            = e(Input::get('notes'));
         $model->eol= null;
 
         if (Input::get('fieldset_id')=='') {

config/version.php

@@ -1,7 +1,7 @@
 <?php
 return array (
-  'app_version' => 'v3.6.1',
-  'build_version' => '5',
-  'hash_version' => 'g6f9a82f',
-  'full_hash' => 'v3.6.1-5-g6f9a82f',
+  'app_version' => 'v3.6.2',
+  'build_version' => '10',
+  'hash_version' => 'g927a12f',
+  'full_hash' => 'v3.6.1-10-g927a12f',
 );