Merge branch 'master' of github.com:djcb/mu

This commit is contained in:
djcb
2015-08-12 20:54:37 +03:00
2 changed files with 4 additions and 2 deletions

View File

@ -1 +1 @@
Please use the 'git log' to see the ChangeLog See NEWS.org

View File

@ -2779,7 +2779,9 @@ is also possible to manage your addresses with the current (2015-06-23)
development release of @t{BBDB}, or releases of @t{BBDB} after development release of @t{BBDB}, or releases of @t{BBDB} after
3.1.2.@footnote{@url{http://savannah.nongnu.org/projects/bbdb/}}. 3.1.2.@footnote{@url{http://savannah.nongnu.org/projects/bbdb/}}.
To enable BBDB, add to your configuration something like: To enable BBDB, add to your @file{~/.emacs} (or its moral equivalent,
such as @file{~/.emacs.d/init.el}) the following @emph{after} the
@code{(require 'mu4e)} line:
@lisp @lisp
;; Load BBDB (Method 1) ;; Load BBDB (Method 1)