PeratX 010096a4e3 Merge branch 'master' into api-31 ... # Conflicts: # app/build.gradle # build.gradle		2022-05-23 11:49:37 +08:00
..
assets/about_html	(happy new year): year, DNS updates	2019-01-01 11:59:43 +08:00
java/org/itxtech/daedalus	Merge branch 'master' into api-31	2022-05-23 11:49:37 +08:00
res	DaedalusVpnService: listen network change and update upstream DNS	2019-10-23 20:13:11 +08:00
AndroidManifest.xml	Merge branch 'master' into api-31	2022-05-23 11:49:37 +08:00