Merge branch 'master' of https://gitee.com/renjianbo0118/HouseProperty
Conflicts: .idea/modules.xml app/src/main/java/http/ApiConfig.java app/src/main/res/xml/network_security_config.xml
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<network-security-config>
|
||||
<network-security-config xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<base-config cleartextTrafficPermitted="true" />
|
||||
</network-security-config>
|
||||
Reference in New Issue
Block a user