Merge branch 'dev'

mac

2024-06-12 12d6db5780d8a2121a3bef2d58bf897b24ff552a

1
2
3
4
<manifest xmlns:android="http://schemas.android.com/apk/res/android" 
    package="com.contrarywind.view"> 
 
</manifest>