Mirrored_Repos/unifios-utilities
1
0
Fork 0
mirror of https://github.com/unifi-utilities/unifios-utilities.git synced 2024-08-30 18:32:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into modularization-updates

Browse Source 
# Conflicts:
#	AdguardHome/udm-files/on_boot.sh
This commit is contained in:
John Dorman
2020-06-28 01:20:40 -07:00
parent ce22e64a02 8fb14cb538
commit 97396ac7a2
3 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/.idea/

0
AdguardHome/udm-files/on_boot.sh Normal file
View File

2
nextdns/docker/Dockerfile
View File

@ -1,5 +1,5 @@
FROM alpine FROM alpine
ENV VERSION=1.6.4 ENV VERSION=1.7.0
LABEL maintainer="John Dorman <dorman@ataxia.cloud>" LABEL maintainer="John Dorman <dorman@ataxia.cloud>"
RUN apk add --no-cache ca-certificates \ RUN apk add --no-cache ca-certificates \
&& mkdir -p /opt/nextdns \ && mkdir -p /opt/nextdns \