summary refs log tree commit diff stats
path: root/web/ticker.txt
diff options
context:
space:
mode:
authorAraq <rumpf_a@web.de>2016-01-18 16:51:54 +0100
committerAraq <rumpf_a@web.de>2016-01-18 16:51:54 +0100
commite80d08583c0493f5d891d7be65095b482d78b6c8 (patch)
tree3f412395b994881ee07fa99619a1cc7e7371aa33 /web/ticker.txt
parente9537f48f3b5b425079925424da7570ba183fbbb (diff)
parent13c98222df26925938bdb8bb55d9af900cc5a228 (diff)
downloadNim-e80d08583c0493f5d891d7be65095b482d78b6c8.tar.gz
Merge branch 'devel' of https://github.com/nim-lang/Nim into devel
Diffstat (limited to 'web/ticker.txt')
-rw-r--r--web/ticker.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/web/ticker.txt b/web/ticker.txt
index a7ad73bc4..f4a3cac2a 100644
--- a/web/ticker.txt
+++ b/web/ticker.txt
@@ -1,8 +1,13 @@
 <a class="news" href="news.html#Z2016-01-18-version-0-13-0-released">
-  <h4>Jan 18, 2016</h4>
+  <h4>January 18, 2016</h4>
   <p>Nim version 0.13.0 has been released!</p>
 </a>
 
+<a class="news" href="news.html#Z2016-01-18-andreas-rumpf-s-talk-at-oscon-amsterdam">
+  <h4>January 18, 2016</h4>
+  <p>Andreas Rumpf's talk at OSCON Amsterdam</p>
+</a>
+
 <a class="news" href="news.html#Z2015-10-27-version-0-12-0-released">
   <h4>October 27, 2015</h4>
   <p>Nim version 0.12.0 has been released!</p>