aliens/org-contacts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'maint'

Browse source 
Conflicts:
	contrib/lisp/htmlize.el
	etc/schema/od-manifest-schema-v1.2-os.rnc
	etc/schema/od-schema-v1.2-os.rnc
	lisp/org-exp-blocks.el
This commit is contained in:
Bastien Guerry 2013-01-01 16:06:17 +01:00
commit dcd8af90c9
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
org-contacts.el
View file

@ -1,6 +1,6 @@
;;; org-contacts.el --- Contacts management ;;; org-contacts.el --- Contacts management
;; Copyright (C) 2010-2012 Julien Danjou <julien@danjou.info> ;; Copyright (C) 2010-2013 Julien Danjou <julien@danjou.info>
;; Author: Julien Danjou <julien@danjou.info> ;; Author: Julien Danjou <julien@danjou.info>
;; Keywords: outlines, hypermedia, calendar ;; Keywords: outlines, hypermedia, calendar