From b46599df9f0c0cf0e14b2de839a23402ca62b5d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 7 Jul 2021 07:26:02 +0200
Subject: [PATCH 1/2] MOBILE-3320 github: Remove workplace from prepare script

---
 .github/workflows/prepare.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/prepare.yml b/.github/workflows/prepare.yml
index 90a274d09..0439e3209 100644
--- a/.github/workflows/prepare.yml
+++ b/.github/workflows/prepare.yml
@@ -2,7 +2,7 @@ name: Prepare
 
 on:
   push:
-    branches: [ master, integration, workplace, freemium-master ]
+    branches: [ master, integration, freemium-master ]
 
 jobs:
   prepare:

From 643cbe0a346ca8716fc04ccae926c1d01448308c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 7 Jul 2021 07:28:12 +0200
Subject: [PATCH 2/2] MOBILE-3320 course: Remove unnecessary align-self-stretch
 property

---
 .../components/myoverview/addon-block-myoverview.html         | 2 +-
 src/core/features/courses/pages/my-courses/my-courses.html    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
index 31cf913b0..b6e750c9f 100644
--- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
+++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html
@@ -91,7 +91,7 @@
         <ion-grid class="ion-no-padding">
             <ion-row class="ion-no-padding">
                 <ion-col *ngFor="let course of filteredCourses" class="ion-no-padding"
-                    size="12" size-sm="6" size-md="6" size-lg="4" size-xl="3" align-self-stretch>
+                    size="12" size-sm="6" size-md="6" size-lg="4" size-xl="3">
                     <core-courses-course-progress [course]="course" class="core-courseoverview" showAll="true"
                         [showDownload]="downloadCourseEnabled && downloadEnabled">
                     </core-courses-course-progress>
diff --git a/src/core/features/courses/pages/my-courses/my-courses.html b/src/core/features/courses/pages/my-courses/my-courses.html
index e0b314f1c..bb3fd00b0 100644
--- a/src/core/features/courses/pages/my-courses/my-courses.html
+++ b/src/core/features/courses/pages/my-courses/my-courses.html
@@ -39,8 +39,8 @@
         </ion-searchbar>
         <ion-grid class="ion-no-padding safe-area-page">
             <ion-row class="ion-no-padding">
-                <ion-col *ngFor="let course of filteredCourses" class="ion-no-padding" size="12" size-sm="6" size-md="6"
-                    size-lg="4" size-xl="4" align-self-stretch>
+                <ion-col *ngFor="let course of filteredCourses" class="ion-no-padding"
+                    size="12" size-sm="6" size-md="6" size-lg="4" size-xl="4">
                     <core-courses-course-progress [course]="course" class="core-courseoverview" showAll="true">
                     </core-courses-course-progress>
                 </ion-col>