AdGuardHome/client
Dimitry Kolyshev 75f01d51f7 Pull request: all: filters json
Merge in DNS/adguard-home from 4581-filters-json to master

Squashed commit of the following:

commit da0b86983432ac1791645da328df5848daac5ea6
Merge: 62fa4fc6 a82ec09a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed May 25 12:58:25 2022 +0200

    Merge remote-tracking branch 'origin/master' into 4581-filters-json

commit 62fa4fc6ff150ebb8dbd8888a58819fb644d43ad
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed May 25 11:55:52 2022 +0200

    all: filters json

commit 96486ffbb41947b5e748f6e35eb96ee73867eba1
Merge: 9956f0af c0ac82be
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue May 24 15:57:52 2022 +0200

    Merge branch 'master' into 4581-filters-json

commit 9956f0aff1b7029f336d22013a62f2871a964322
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue May 24 15:53:43 2022 +0200

    all: filters json
2022-05-25 14:31:32 +03:00
..
public Update login.html 2022-01-18 18:38:57 +05:30
src Pull request: all: filters json 2022-05-25 14:31:32 +03:00
.eslintrc.json
.gitattributes
.stylelintrc
babel.config.js
constants.js
dev.eslintrc
jest.config.js
package-lock.json Pull request: 3503 password policy 2022-02-10 18:30:41 +03:00
package.json Pull request: 3503 password policy 2022-02-10 18:30:41 +03:00
prod.eslintrc
webpack.common.js
webpack.dev.js
webpack.prod.js Pull request: all: add bamboo specs 2021-04-08 13:55:12 +03:00