kissygalleryteam/sideNav — pull request #3 by songxc (2013-11-01 07:47:15+00:00)
Title: fix merge config bug. use mix instead.

fix merge config bug. use mix instead.