local
Merge branch 'master' of
https://github.com/LittleFire1989/DreamDiary.git

Conflicts:
	res/layout/share.xml