Skip to content

Commit

Permalink
Merge pull request #367 from autocrypt/event2
Browse files Browse the repository at this point in the history
add elevate event
  • Loading branch information
r10s committed Feb 20, 2018
2 parents 0a4f4a5 + 71ebfc9 commit 21a2b2d
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion doc/contact.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,12 @@ and the ACLU_.
Upcoming events
---------------

- March 2018: `Internet Freedom Festival`_, Valencia. There
- Mar 2nd 2018: `Elevate Festival <https://elevate.at>`_, Graz (Austria).
Xenia and Holger are going to participate in a panel
`"Risk a radical shift" <https://elevate.at/diskursprogramm/e18radicalshift/>`_
and a session `"Riot in the Matrix -- What's next?" <https://elevate.at/diskursprogramm/e18riotmatrix/>`_ involving Autocrypt and Delta.chat as topics.

- March 8th 2018: `Internet Freedom Festival`_, Valencia. There
is going to be an `Autocrypt Intro + Demonstration session
<https://platform.internetfreedomfestival.org/en/IFF2018/public/schedule/custom/238>`_
on thursday, March 8th.
Expand Down

0 comments on commit 21a2b2d

Please sign in to comment.