diff options
author | mathieui <mathieui@mathieui.net> | 2014-12-24 01:00:34 +0100 |
---|---|---|
committer | mathieui <mathieui@mathieui.net> | 2014-12-24 01:00:34 +0100 |
commit | 183a151d9934992efd4623bed4bf0335c81b4b69 (patch) | |
tree | 36b25b01043ff90e09f11011e134842b0ac0c725 /src/config.py | |
parent | 668c1eb67741304278dfa05c68a7e1f33ae3181b (diff) | |
parent | 9da530f8541ed96fe5fa7e3ff01df5290f511633 (diff) | |
download | poezio-183a151d9934992efd4623bed4bf0335c81b4b69.tar.gz poezio-183a151d9934992efd4623bed4bf0335c81b4b69.tar.bz2 poezio-183a151d9934992efd4623bed4bf0335c81b4b69.tar.xz poezio-183a151d9934992efd4623bed4bf0335c81b4b69.zip |
Merge branch 'master_rebased' of https://github.com/Perdu/poezio
Diffstat (limited to 'src/config.py')
-rw-r--r-- | src/config.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/config.py b/src/config.py index 339e8a85..43b88c98 100644 --- a/src/config.py +++ b/src/config.py @@ -43,6 +43,7 @@ DEFAULT_CONFIG = { 'custom_port': '', 'default_nick': '', 'deterministic_nick_colors': True, + 'nick_color_aliases': True, 'display_activity_notifications': False, 'display_gaming_notifications': False, 'display_mood_notifications': False, @@ -135,6 +136,8 @@ DEFAULT_CONFIG = { 'var': { 'folded_roster_groups': '', 'info_win_height': 2 + }, + 'muc_colors': { } } |