no message
Merge branch 'master' of https://github.com/cherrylabs/adapter-twitter

Conflicts:
	composer.json