mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-08-16 22:20:30 +03:00
5e20ac7ed5
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed
43 lines
575 B
Plaintext
43 lines
575 B
Plaintext
.DS_Store
|
|
/.git
|
|
/.github
|
|
/.vscode
|
|
.idea
|
|
/AdGuardHome
|
|
/AdGuardHome.exe
|
|
/AdGuardHome.yaml
|
|
/AdGuardHome.log
|
|
/data
|
|
/build
|
|
/build2
|
|
/dist
|
|
/client/node_modules
|
|
/client2/node_modules
|
|
/.gitattributes
|
|
/.gitignore
|
|
/.goreleaser.yml
|
|
/changelog.config.js
|
|
/coverage.txt
|
|
/Dockerfile
|
|
/LICENSE.txt
|
|
/Makefile
|
|
/querylog.json
|
|
/querylog.json.1
|
|
/*.md
|
|
|
|
# Test output
|
|
dnsfilter/tests/top-1m.csv
|
|
dnsfilter/tests/dnsfilter.TestLotsOfRules*.pprof
|
|
|
|
# Snapcraft build temporary files
|
|
*.snap
|
|
launchpad_credentials
|
|
snapcraft_login
|
|
snapcraft.yaml.bak
|
|
|
|
# IntelliJ IDEA project files
|
|
*.iml
|
|
|
|
# Packr
|
|
*-packr.go
|