From bc899c6562db68c1eb05c5fa67deac1405e1c488 Mon Sep 17 00:00:00 2001
From: jsoto0025 <41553182+jsoto0025@users.noreply.github.com>
Date: Sat, 21 May 2022 06:57:57 -0500
Subject: [PATCH 1/2] Create development_VARIAMOS-WEB.yml

Added GitHub action file for development branch
---
 .../workflows/development_VARIAMOS-WEB.yml    | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 .github/workflows/development_VARIAMOS-WEB.yml

diff --git a/.github/workflows/development_VARIAMOS-WEB.yml b/.github/workflows/development_VARIAMOS-WEB.yml
new file mode 100644
index 0000000..87c3e38
--- /dev/null
+++ b/.github/workflows/development_VARIAMOS-WEB.yml
@@ -0,0 +1,32 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+
+name: Build and deploy container app to Azure Web App - variamosweb
+
+on:
+  push:
+    branches:
+      - development
+
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: 'ubuntu-latest'
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Login to ACR
+      uses: docker/login-action@v1
+      with:
+        registry: variamos.azurecr.io
+        username: ${{secrets.ACRUSERNAME}}
+        password: ${{secrets.ACRUSERPASSWORD}}
+
+    - name: Build and push container image to registry
+      uses: docker/build-push-action@v2
+      with:
+        push: true
+        tags: variamos.azurecr.io/${{secrets.ACRUSERNAME}}/variamosweb:latest
+        file: ./Dockerfile

From 13b5bdb496bb6b094e0cd39efb1f181eb8a478a0 Mon Sep 17 00:00:00 2001
From: aolopezeafit <aolopezh@eafit.edu.co>
Date: Sat, 21 May 2022 07:45:45 -0500
Subject: [PATCH 2/2] Test

---
 src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index 5807b90..4ca56b2 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -42,7 +42,7 @@
     "about_team_past_authors2": "Raul Mazo, Diego Quiroz, Sebastian Monsalve, David Lopez, Jose Lopez",
     "about_team_past_authors3": "Raul Mazo",
     "home_welcome": "Welcome to VariaMos web",
-    "home_variamos": "VariaMos 2.22.05.20.16",
+    "home_variamos": "VariaMos 2.22.05.20.17",
     "reports_title": "Reports",
     "app_variamos": "VariaMos",
     "app_search": "Search",