Revert "Aggiornamento a 0.6.1"

This reverts commit 701e1f1968.

.env.development

@@ -1,8 +1,12 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 APP_VERSION="0.5.84"
 =======
 APP_VERSION="0.5.85"
 >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
+=======
+APP_VERSION="0.5.85"
+>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"

.env.example.production

@@ -1,8 +1,12 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 APP_VERSION="0.5.84"
 =======
 APP_VERSION="0.5.85"
 >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
+=======
+APP_VERSION="0.5.85"
+>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

.env.test.risosrv

@@ -1,8 +1,12 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 APP_VERSION="0.5.84"
 =======
 APP_VERSION="0.5.85"
 >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
+=======
+APP_VERSION="0.5.85"
+>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/riso.app/.env.development

@@ -1,8 +1,12 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 APP_VERSION="0.5.84"
 =======
 APP_VERSION="0.5.85"
 >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
+=======
+APP_VERSION="0.5.85"
+>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"

_ALL_SITES/riso.app/.env.production

@@ -1,8 +1,12 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 APP_VERSION="0.5.84"
 =======
 APP_VERSION="0.5.85"
 >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
+=======
+APP_VERSION="0.5.85"
+>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/terradellavisione.app/.env.development

@@ -1,8 +1,12 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 APP_VERSION="0.5.84"
 =======
 APP_VERSION="0.5.85"
 >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
+=======
+APP_VERSION="0.5.85"
+>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="14"
 DIRECTORY_LOCAL="newfreeplanet"

src/components/CGridTableRec/CGridTableRec.vue

@@ -1105,13 +1105,19 @@
       </CMyCardCircuitPopup>
       <CMyCardService v-else-if="mytable === 'myskills'"
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
+=======
+>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
         :table="mytable" :prop_myrec="myrecdialog">
       </CMyCardService>
       <CMyCardService v-else-if="mytable === 'mygoods'"
         :table="mytable" :prop_myrec="myrecdialog">
       </CMyCardService>
       <CMyCardService v-else-if="mytable === 'myhosps'"
+<<<<<<< HEAD
+>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
+=======
 >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
         :table="mytable" :prop_myrec="myrecdialog">
       </CMyCardService>

src/components/CMyCardService/CMyCardService.vue

@@ -146,9 +146,12 @@
               }}</q-item-label>
             </q-item-section>
           </q-item>
+<<<<<<< HEAD
 <<<<<<< HEAD
           <q-item>
 =======
+=======
+>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
 
           <q-item v-if="getSectorByRec(myrec)">
 >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)

src/css/app.scss

@@ -1630,4 +1630,7 @@ h3 {
   color: grey;
   font-size: 0.8rem;
 }
+<<<<<<< HEAD
+>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
+=======
 >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)

src/statics/lang/it.js

@@ -1489,6 +1489,11 @@ const msg_it = {
       bookmark_set: 'Aggiunto ai Segnalibri',
       bookmark_unset: 'Rimosso dai Segnalibri',
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+      favorite: 'Utenti Favoriti',
+      bookmark: 'Utenti Segnalibri',
+>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
 =======
       favorite: 'Utenti Favoriti',
       bookmark: 'Utenti Segnalibri',