?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(parent: 034c176) | patch
org-feed: Fix 034c176 merge resolution
commit01319a41a32796fad2c94f42d9d5e9bf6eb52cd7
authorKyle Meyer <kyle@kyleam.com>
Sun, 24 Jan 2016 23:23:42 +0000 (24 18:23 -0500)
committerKyle Meyer <kyle@kyleam.com>
Sun, 24 Jan 2016 23:23:42 +0000 (24 18:23 -0500)
tree6cfd63ca12632d762644642f4a28f5335ceb6924tree | snapshot (tar.gz zip)
parent034c176995d4186012331c02868ce4804f352feacommit | diff
org-feed: Fix 034c176 merge resolution

Restore unrelated change from 528a274 (org-feed: Silence byte-compiler,
2016-01-07).
lisp/org-feed.el diff | blob | blame | history
Org-mode, an Emacs mode for organizing your life.