Merge branch 'master' into 'dns'

# Conflicts:
#   contact.php

.gitlab-ci.yml

@@ -20,7 +20,7 @@ before_script:
 deploy:
   stage: deploy
   script:
-    - rsync -Ppr -e "ssh -p 22" --progress --exclude=".git" $CI_PROJECT_DIR/ $u1n3_user@$u1n3_ip:$u1n3_pwd
+    - rsync -Ppr -e "ssh -p 22" --progress --exclude=".git"  --exclude=".htaccess"  --exclude=".gitignore" $CI_PROJECT_DIR/ $u1n3_user@$u1n3_ip:$u1n3_pwd
     # Non interactive ssh gracefully reloads server
     #- ssh $hawk_bs_user@$hawk_bs_ip '. /etc/profile; pm2 reload all'
   only:

contact.php

@@ -119,7 +119,6 @@ include("_navbar.php");
 						</div>
 					</div>
                     
-
                     <div class="form-group mb-7 mb-md-9">
                 
                         <!-- Input -->