mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer
This commit is contained in:
@@ -46,6 +46,7 @@
|
||||
<icon density="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png" />
|
||||
<icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
|
||||
</platform>
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<mfp:android>
|
||||
<mfp:sdkChecksum>3077110622</mfp:sdkChecksum>
|
||||
@@ -92,6 +93,8 @@
|
||||
<mfp:SDKProtocolVersion>2</mfp:SDKProtocolVersion>
|
||||
=======
|
||||
>>>>>>> d9593fa592ca58a1f04e3fcd0aaf596f9a54cd3a
|
||||
=======
|
||||
>>>>>>> 562e405f192af623ae8d2ac244c729b150b0cf99
|
||||
<allow-navigation href="http://localhost:8100" sessionid="9714472a" />
|
||||
<allow-navigation href="http://localhost:8101" sessionid="4721f88c" />
|
||||
<plugin name="cordova-plugin-dbcopy" spec="https://github.com/an-rahulpandey/cordova-plugin-dbcopy.git" />
|
||||
|
||||
Reference in New Issue
Block a user