mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-09-11 10:45:42 +03:00
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
26 lines
558 B
Plaintext
26 lines
558 B
Plaintext
# Please, DO NOT put your text editors' temporary files here. The more are
|
|
# added, the harder it gets to maintain and manage projects' gitignores. Put
|
|
# them into your global gitignore file instead.
|
|
#
|
|
# See https://stackoverflow.com/a/7335487/1892060.
|
|
#
|
|
# Only build, run, and test outputs here. Sorted.
|
|
*-packr.go
|
|
*.db
|
|
*.log
|
|
*.snap
|
|
/bin/
|
|
/build/
|
|
/build2/
|
|
/data/
|
|
/dist/
|
|
/dnsfilter/tests/dnsfilter.TestLotsOfRules*.pprof
|
|
/dnsfilter/tests/top-1m.csv
|
|
/launchpad_credentials
|
|
/querylog.json*
|
|
/snapcraft_login
|
|
AdGuardHome*
|
|
coverage.txt
|
|
leases.db
|
|
node_modules/
|