diff options
| author | Magnus Henoch <magnus.henoch@gmail.com> | 2013-11-25 23:36:12 +0000 |
|---|---|---|
| committer | Magnus Henoch <magnus.henoch@gmail.com> | 2013-11-25 23:36:12 +0000 |
| commit | 3fc929628606d988e5a41cac9d5941c87a23ae26 (patch) | |
| tree | 489a2ec22e02006fb51c7069af9e99c9a508b8ec /jabber-muc.el | |
| parent | 0b40a35043e7f6fb256411c2b9287b820c6d7ec1 (diff) | |
Merge jabber-newdisco into jabber-disco
The functionality is about to start overlapping. Also, there wasn't
much sense in separating the two to begin with.
Diffstat (limited to 'jabber-muc.el')
| -rw-r--r-- | jabber-muc.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jabber-muc.el b/jabber-muc.el index 45a7bd8..ceb8bc4 100644 --- a/jabber-muc.el +++ b/jabber-muc.el @@ -22,7 +22,7 @@ (require 'jabber-chat) (require 'jabber-widget) -(require 'jabber-newdisco) +(require 'jabber-disco) (require 'jabber-muc-nick-coloring) (require 'cl) |