Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7127f34f authored by Akhil's avatar Akhil 🙂
Browse files

Merge branch 'dev/murena-workspace' into 'main' 

Dev/murena workspace

See merge request !243
parents f55ab973 1b92a2e1

Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ ARG NOTES_VERSION="4.9.4" 
ARG CONTACTS_JOB_ID="881946"

ARG CALENDAR_JOB_ID="872766"

ARG EMAIL_RECOVERY_JOB_ID="940904"

ARG EA_JOB_ID="940912"

ARG EA_JOB_ID="953602"

ARG LAUNCHER_JOB_ID="881954"

ARG GOOGLE_INTEGRATION_VERSION="2.2.0"

ARG DASHBOARD_JOB_ID="881962"

patches/016-login-screen.patch

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
+					<div class="lines">

+					</div>

+					<div class="banner-content">

+						<div class="banner-content-get-free-murena"><p><?php p($l->t('Get your FREE Murena Cloud account now')); ?></p></div>

+						<div class="banner-content-get-free-murena"><p><?php p($l->t('Get your FREE Murena Workspace account now')); ?></p></div>

+						<div class="banner-content-why-murena">

+							<ol>

+								<li><?php p($l->t('1GB storage for FREE to store and sync your pictures & videos.')); ?></li>