Martin 152848a04f Merge branch 'master' into dev_680_礼物展馆 ... # Conflicts: # common/src/main/res/values-zh-rHK/strings.xml # common/src/main/res/values-zh-rTW/strings.xml # common/src/main/res/values-zh/strings.xml # common/src/main/res/values/strings.xml # gradle.properties # live/build.gradle		2024-07-17 09:53:22 +08:00
..
attrs.xml	androidx版本首次提交	2022-07-18 15:31:45 +08:00
colors.xml	6.8.0:谷歌内购版本升级，小游戏结算界面优化	2024-06-27 18:30:51 +08:00
dimens.xml	11111	2022-08-05 18:16:48 +08:00
strings.xml	Merge branch 'master' into dev_680_礼物展馆	2024-07-17 09:53:22 +08:00
style.xml	add[整蛊翻译]	2024-06-11 16:55:07 +08:00