董宏宇 5d62028b2e Merge branch 'qa_1.1.8' into qa_1.1.8_easy_mode ...

# Conflicts:
#	modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml
#	skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml

2020-11-30 18:03:47 +08:00

..

java/com/mogo/module/v2x

Merge branch 'qa_1.1.8' into qa_1.1.8_easy_mode

2020-11-30 18:03:47 +08:00

res

Merge branch 'qa_1.1.8' into qa_1.1.8_easy_mode

2020-11-30 18:03:47 +08:00

AndroidManifest.xml

add ugc upload

2020-10-21 11:45:23 +08:00