[git] gnupg-doc - branch, master, updated. 167b1395db1c0539001cd408c852ed163f76ca3f

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GnuPG website and other docs".

The branch, master has been updated
       via  167b1395db1c0539001cd408c852ed163f76ca3f (commit)
      from  3a1c2730c0e0791df51da23a4c55f28b37187681 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 167b1395db1c0539001cd408c852ed163f76ca3f
Author: Werner Koch <wk at gnupg.org>
Date:   Fri May 20 13:25:36 2016 +0200

    news: Add OpenPGP.conf item

diff --git a/web/index.org b/web/index.org
index f2dcf63..7682c1d 100644
--- a/web/index.org
+++ b/web/index.org
@@ -66,6 +66,11 @@ The latest release news:\\
 # GnuPG's latest news are available as [[http://feedvalidator.org/check.cgi?url%3Dhttps://www.gnupg.org/news.en.rss][RSS 2.0 compliant]] feed.  Just
 # point or paste the [[news.en.rss][RSS file]] into your aggregator.
 
+** First OpenPGP conference (2016-05-20)
+
+If you are a user or implementer of OpenPGP related software, you may
+join us at [[https://gnupg.org/conf/][OpenPGP.conf]] in Cologne on September 8 and 9, 2016.
+
 ** GnuPG 2.1.12 released (2016-05-04)
 
 A new version of the /modern/ branch of GnuPG has been released.

-----------------------------------------------------------------------

Summary of changes:
 web/index.org | 5 +++++
 1 file changed, 5 insertions(+)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org