emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] scratch/org-contacts-rebased 5526110 018/118: Merge branch 'origi


From: Stefan Monnier
Subject: [elpa] scratch/org-contacts-rebased 5526110 018/118: Merge branch 'origin-maint'
Date: Fri, 12 Nov 2021 15:36:56 -0500 (EST)

branch: scratch/org-contacts-rebased
commit 5526110aacd34ba4eef763c371f7e8b3055cda14
Merge: ef5cb24 2e77024
Author: Eric Schulte <eric.schulte@gmx.com>
Commit: Eric Schulte <eric.schulte@gmx.com>

    Merge branch 'origin-maint'
    
    Conflicts:
        contrib/lisp/org-mac-link-grabber.el
        doc/org.texi
        lisp/org-odt.el
        testing/lisp/test-ob.el



reply via email to

[Prev in Thread] Current Thread [Next in Thread]