1
2Merge branch 'v1.1' of https://github.com/DrayChou/douban2twitter into v1.1

Conflicts:
	wwwroot/index.php