Merge master into aside-menu

src/_digifi/layout/components/footer/Footer.tsx

@@ -23,12 +23,17 @@ const Footer = () => {
 
       <ul className='menu menu-gray-600 menu-hover-primary fw-semibold order-1'>
         <li className='menu-item'>
+<<<<<<< HEAD
           <a href='' target='_blank' className='menu-link px-2'>
+=======
+          <a href='https://www.chiefsoft.com/' target='_blank' className='menu-link px-2'>
+>>>>>>> master
             About
           </a>
         </li>
 
         <li className='menu-item'>
+<<<<<<< HEAD
           <a href='' target='_blank' className='menu-link px-2'>
             Support
           </a>
@@ -43,6 +48,12 @@ const Footer = () => {
             Purchase
           </a>
         </li>
+=======
+          <a href='https://www.chiefsoft.com/' target='_blank' className='menu-link px-2'>
+            Support
+          </a>
+        </li>
+>>>>>>> master
       </ul>
     </>
   )