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

Commit c7793115 authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

conflict resolved

parents 60df399c 3aeb858d
Loading
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
FROM nextcloud:26.0.8-fpm AS nextcloud
ARG BASE_DIR="/usr/src/nextcloud"
ARG TMP_PATCH_DIR="/tmp/build_patches"
ARG THEME_HELPER_JOB_ID="761085"
ARG THEME_HELPER_JOB_ID="812372"
ARG NOTES_VERSION="4.9.2"
ARG CONTACTS_JOB_ID="740210"
ARG CALENDAR_JOB_ID="738789"
ARG CALENDAR_JOB_ID="812355"
ARG EMAIL_RECOVERY_JOB_ID="738840"
ARG EA_JOB_ID="738865"
ARG LAUNCHER_JOB_ID="798389"