summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--content/pages/resources.html4
-rw-r--r--theme/templates/index.html3
2 files changed, 6 insertions, 1 deletions
diff --git a/content/pages/resources.html b/content/pages/resources.html
index cf7015f..776d084 100644
--- a/content/pages/resources.html
+++ b/content/pages/resources.html
@@ -48,6 +48,10 @@
Sebastian Krzyszkowiak; <em>Poznańska Impreza Wolnego Oprogramowania, Poznań, 17.05.2014</em></li>
<li><strong>Neo900: Crafting The Private Phone</strong> - <a href="http://neo900.org/stuff/ohsw2014/ohsw2014.pdf" target="_blank">PDF</a>, <a href="http://neo900.org/stuff/ohsw2014/OHSW14%20-%20Neo900-ahPFCFooBv0.mp4" target="_blank">MP4</a>, <a href="/ohsw2014" target="_blank">YouTube</a><br/>
Sebastian Krzyszkowiak; <em>OpenPhoenux Hard &amp; Software Workshop, Garching, 29.11.2014</em></li>
+ <li><strong>Neo900: Lightning talk</strong> - <a href="http://neo900.org/stuff/cccamp15/lightningtalk.mp4" target="_blank">MP4</a><br/>
+ Werner Almesberger; <em>Chaos Communication Camp 2015, Zehdenick, 14.08.2015</em></li>
+ <li><strong>The Neo900 Open Smartphone: A platform with new security features</strong> - <a href="http://neo900.org/stuff/cccamp15/ccc2015talk/talk.pdf" target="_blank">PDF</a>, <a href="http://neo900.org/stuff/cccamp15/ccc2015talk/neo900-wpwrak_CCC2015.webm" target="_blank">WebM</a><br/>
+ Werner Almesberger; <em>Chaos Communication Camp 2015, Zehdenick, 16.08.2015</em></li>
</ul>
<h4>Videos</h4>
diff --git a/theme/templates/index.html b/theme/templates/index.html
index 05ecd15..cfee5c5 100644
--- a/theme/templates/index.html
+++ b/theme/templates/index.html
@@ -31,7 +31,8 @@
<div style="height: 450px; max-height: 400px; overflow: hidden; position: relative">
<p class="lead" style="margin: 1em 0 0.5em">
- The Neo900 project will be present at <a href="https://events.ccc.de/camp/2015/wiki/Main_Page">CCCamp2015</a> next week near Berlin. If you happen to be there, feel invited to join us at <a href="https://events.ccc.de/camp/2015/wiki/Village:Neo">the Neo village</a>!
+ The Neo900 project was present at <a href="https://events.ccc.de/camp/2015/wiki/Main_Page">CCCamp2015</a> at <a href="https://events.ccc.de/camp/2015/wiki/Village:Neo">the Neo village</a>.
+ Check out the talks we were giving there at our <a href="/resources">resources page</a>!
</p>
<p style="text-align: center">