Merge remote-tracking branch 'origin/master' into compose_focus

Kyle Francis

2016-04-02 65225262f6bb524b93feb49178509cada3390ee3

1
2
3
4
5
6
7
<?php
 
// Enable emoticons in plain text messages preview
$config['emoticons_display'] = false;
 
// Enable emoticons in compose editor (HTML)
$config['emoticons_compose'] = true;