no zuo no die
Merge branch 'master' of github.com:tinylamb/PopClip-Ext-

no zuo no die
Conflicts:
	Downloads/DoubanDiary.popclipextz
	Source/DoubanDiary/Config.plist