Merge branch 'dev'

.idea/workspace.xml

@@ -2,14 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="8158f4f2-d203-437c-b31c-c88b75fc0c52" name="Changes" comment="WIP">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/config/app.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/app.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/public/assets/sib_logo.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/public/js/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/js/app.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/public/js/app.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/public/js/app.js.map" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/public/mix-manifest.json" beforeDir="false" afterPath="$PROJECT_DIR$/public/mix-manifest.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/js/Components/ErpaLogo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/resources/js/Components/ErpaLogo.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/resources/js/Layouts/AppLayout.vue" beforeDir="false" afterPath="$PROJECT_DIR$/resources/js/Layouts/AppLayout.vue" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -405,7 +398,7 @@
       <workItem from="1641368907116" duration="6126000" />
       <workItem from="1641375603120" duration="3547000" />
       <workItem from="1642675566031" duration="940000" />
-      <workItem from="1642681492972" duration="1417000" />
+      <workItem from="1642681492972" duration="1509000" />
     </task>
     <servers />
   </component>

config/app.php

@@ -21,7 +21,7 @@ return [
     |--------------------------------------------------------------------------
     */
 
-    'version' => '1.0.4',
+    'version' => '1.0.7',
 
     /*
     |--------------------------------------------------------------------------