-
Rafał Malinowski authored
Conflicts: kadu-core/chat-style/chat-style-manager.cpp kadu-core/chat-style/engine/adium/adium-time-formatter.cpp kadu-core/chat/html-messages-renderer.cpp kadu-core/chat/style-engines/chat-engine-adium/chat-engine- adium.cpp kadu-core/chat/style-engines/chat-engine-kadu/chat-engine- kadu.cpp kadu-core/gui/widgets/chat-messages-view.cpp kadu-core/gui/widgets/configuration/config-preview.cpp kadu-core/gui/widgets/plugin-list/plugin-list-widget-item- delegate.cpp kadu-core/gui/widgets/plugin-list/plugin-list-widget.cpp plugins/gadu_protocol/gui/widgets/gadu-create-account-widget.cpp plugins/gadu_protocol/gui/widgets/gadu-create-account-widget.h plugins/gadu_protocol/gui/widgets/token-widget.cpp plugins/gadu_protocol/gui/widgets/token-widget.h plugins/gadu_protocol/gui/windows/gadu-change-password- window.cpp plugins/gadu_protocol/gui/windows/gadu-change-password-window.h plugins/gadu_protocol/gui/windows/gadu-remind-password- window.cpp plugins/gadu_protocol/gui/windows/gadu-remind-password-window.h plugins/gadu_protocol/gui/windows/gadu-unregister-account- window.cpp plugins/gadu_protocol/gui/windows/gadu-unregister-account- window.h plugins/gadu_protocol/gui/windows/gadu-wait-for-account- register-window.cpp plugins/gadu_protocol/server/gadu-token-fetcher.cpp plugins/gadu_protocol/server/gadu-token-fetcher.h
bda280bb