ArtemBaskal c12309a1b2 Resolve conflict

2020-07-03 16:58:23 +03:00

..

__locales

Resolve conflict

2020-07-03 16:58:23 +03:00

__tests__

- client: Match client IP strictly: Merge pull request #620 in DNS/adguard-home from fix/1687 to master

2020-05-29 12:53:40 +03:00

actions

- client: Make language tag in HTML same as setting language

2020-07-03 11:14:54 +03:00

api

+ client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master

2020-05-22 17:06:05 +03:00

components

Resolve conflict

2020-07-03 16:58:23 +03:00

containers

Merge: fix #1421

2020-06-18 00:36:19 +03:00

helpers

Resolve conflict

2020-07-03 16:58:23 +03:00

install

- client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master

2020-06-10 19:04:19 +03:00

login

- client: Add default mode in the DNS settings: Merge pull request #650 in DNS/adguard-home from fix/1770 to master

2020-06-10 19:04:19 +03:00

reducers

Merge: fix #1421

2020-06-18 00:36:19 +03:00

configureStore.js

+ client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master

2020-05-22 17:06:05 +03:00

i18n.js

- client: Make language tag in HTML same as setting language

2020-07-03 11:14:54 +03:00

index.js

Translate dashboard to Vietnamese with i18n

2018-10-25 14:28:52 +07:00