slider标签嵌套微调

slider标签嵌套微调
Merge remote-tracking branch 'origin/master'

Conflicts:
	slider.php