# Conflicts:
#	config.gradle

# Conflicts:
#	config.gradle

# Conflicts:
#	config.gradle

# Conflicts:
#	config.gradle

# Conflicts:
#	config.gradle

Merge branch '4.2.60_lp_test' into 4.2.60

# Conflicts:
#	m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java
#	m-im/src/main/res/values/colors.xml