1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00

Merge branch 'master' into osx-functional

This commit is contained in:
James Booth 2016-05-01 20:36:36 +01:00
commit e52a642956

View File

@ -1507,7 +1507,6 @@ _get_default_boolean(preference_t pref)
case PREF_TLS_SHOW: case PREF_TLS_SHOW:
case PREF_LASTACTIVITY: case PREF_LASTACTIVITY:
case PREF_NOTIFY_MENTION_WHOLE_WORD: case PREF_NOTIFY_MENTION_WHOLE_WORD:
case PREF_TRAY:
return TRUE; return TRUE;
default: default:
return FALSE; return FALSE;