# multilanguage: added possibility to have multiple languages and switch between them per account
Merge branch 'master' into conversations

Conflicts:
	sql/0002.sql