LinuxServer.io/docker-nextcloud
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-nextcloud.git synced 2026-06-03 09:57:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflilct

Browse Source
This commit is contained in:
Eric Nemchik
2022-09-09 21:31:12 -05:00
parent c4d302097e
commit b45a89f1d5
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package_versions.txt
+24 -24
View File
@@ -2,7 +2,7 @@ alpine-baselayout-3.2.0-r16
alpine-keys-2.4-r0
alsa-lib-1.2.5-r2
aom-libs-1.0.0-r3
apache2-utils-2.4.51-r0
apache2-utils-2.4.54-r0
apk-tools-2.12.7-r0
apr-1.7.0-r1
apr-util-1.6.1-r7
@@ -10,7 +10,7 @@ argon2-libs-20190702-r1
avahi-libs-0.8-r5
bash-5.1.16-r0
brotli-libs-1.0.9-r5
busybox-1.33.1-r6
busybox-1.33.1-r8
c-client-2007f-r11
ca-certificates-20220614-r0
ca-certificates-bundle-20220614-r0
@@ -18,9 +18,9 @@ cairo-1.16.0-r5
cairo-gobject-1.16.0-r5
coreutils-8.32-r2
cups-libs-2.3.3-r3
curl-7.79.1-r2
curl-7.79.1-r3
dbus-libs-1.12.20-r2
expat-2.4.1-r0
expat-2.4.7-r0
ffmpeg-4.4.1-r0
ffmpeg-libs-4.4.1-r0
fontconfig-2.13.1-r4
@@ -37,24 +37,24 @@ gnutls-3.7.1-r1
graphite2-1.3.14-r0
harfbuzz-2.8.1-r0
icu-libs-67.1-r2
imagemagick-7.0.11.14-r0
imagemagick-libs-7.0.11.14-r0
imagemagick-7.0.11.14-r1
imagemagick-libs-7.0.11.14-r1
jansson-2.13.1-r0
jbig2dec-0.19-r0
lame-3.100-r0
lcms2-2.12-r1
ldb-2.3.3-r0
libacl-2.2.53-r0
libarchive-3.5.2-r0
libarchive-3.5.3-r0
libass-0.15.1-r0
libattr-2.5.1-r0
libblkid-2.37.2-r0
libblkid-2.37.4-r0
libbsd-0.11.3-r0
libbz2-1.0.8-r1
libc-utils-0.7.2-r3
libcap-2.50-r0
libcrypto1.1-1.1.1q-r0
libcurl-7.79.1-r2
libcurl-7.79.1-r3
libdav1d-0.9.0-r0
libde265-1.0.8-r2
libdrm-2.4.106-r0
@@ -72,7 +72,7 @@ libmagic-5.40-r1
libmcrypt-2.5.8-r9
libmd-1.0.3-r0
libmemcached-libs-1.0.18-r4
libmount-2.37.2-r0
libmount-2.37.4-r0
libogg-1.3.5-r0
libpciaccess-0.16-r0
libpng-1.6.37-r1
@@ -84,7 +84,7 @@ libretls-3.3.3p1-r3
librsvg-2.50.4-r1
libsasl-2.1.28-r0
libsm-1.2.3-r0
libsmbclient-4.14.8-r0
libsmbclient-4.14.12-r0
libsodium-1.0.18-r0
libsrt-1.4.2-r0
libssh-0.9.6-r0
@@ -93,12 +93,12 @@ libstdc++-10.3.1_git20210424-r2
libtasn1-4.17.0-r0
libtheora-1.1.1-r16
libunistring-0.9.10-r1
libuuid-2.37.2-r0
libuuid-2.37.4-r0
libva-2.11.0-r0
libvdpau-1.4-r0
libvorbis-1.3.7-r0
libvpx-1.10.0-r0
libwbclient-4.14.8-r0
libwbclient-4.14.12-r0
libwebp-1.2.0-r2
libx11-1.7.2-r0
libxau-1.0.9-r0
@@ -114,7 +114,7 @@ libxt-1.2.1-r0
libzip-1.7.3-r2
linux-pam-1.5.1-r1
lmdb-0.9.29-r0
logrotate-3.18.1-r0
logrotate-3.18.1-r3
lz4-libs-1.9.3-r1
musl-1.2.2-r3
musl-utils-1.2.2-r3
@@ -123,14 +123,14 @@ ncurses-libs-6.2_p20210612-r1
ncurses-terminfo-base-6.2_p20210612-r1
nettle-3.7.3-r0
nghttp2-libs-1.43.0-r0
nginx-1.20.2-r0
nginx-1.20.2-r1
oniguruma-6.9.7.1-r0
openssl-1.1.1q-r0
opus-1.3.1-r1
p11-kit-0.23.22-r0
pango-1.48.5-r0
pcre-8.44-r0
pcre2-10.36-r0
pcre2-10.36-r1
php7-7.4.26-r0
php7-bcmath-7.4.26-r0
php7-bz2-7.4.26-r0
@@ -181,11 +181,11 @@ popt-1.18-r0
procps-3.3.17-r0
readline-8.1.0-r0
s6-ipcserver-2.10.0.3-r0
samba-client-4.14.8-r0
samba-client-libs-4.14.8-r0
samba-common-4.14.8-r0
samba-libs-4.14.8-r0
samba-util-libs-4.14.8-r0
samba-client-4.14.12-r0
samba-client-libs-4.14.12-r0
samba-common-4.14.12-r0
samba-libs-4.14.12-r0
samba-util-libs-4.14.12-r0
scanelf-1.3.2-r0
sdl2-2.0.14-r1
shadow-4.8.1-r0
@@ -193,14 +193,14 @@ shared-mime-info-2.1-r0
skalibs-2.10.0.3-r0
soxr-0.1.3-r2
sqlite-libs-3.35.5-r0
ssl_client-1.33.1-r6
ssl_client-1.33.1-r8
sudo-1.9.7_p1-r1
talloc-2.3.2-r1
tar-1.34-r0
tdb-libs-1.4.3-r1
tevent-0.10.2-r1
tiff-4.2.0-r1
tzdata-2021e-r0
tiff-4.3.0-r0
tzdata-2022c-r0
unzip-6.0-r9
utmps-0.1.0.2-r0
v4l-utils-libs-1.20.0-r0