diff options
| author | Lars Henrik Mai <lars.mai@kontinui.de> | 2014-09-21 11:57:48 +0200 |
|---|---|---|
| committer | Lars Henrik Mai <lars.mai@kontinui.de> | 2014-09-21 11:57:48 +0200 |
| commit | 33fe06d9edd5bc3a637e5b0e5f979dbced8f95d0 (patch) | |
| tree | 5d8370d7dd2f0ecae9de7b35fb7d952e841b4e0b /source/aktuelles/index.html.erb | |
| parent | 35239fc1f4641db1e602383b43cc29b151cde9b9 (diff) | |
| parent | f3100ad9d93fd31a043594815e260958f5ceaff0 (diff) | |
Merge branch 'convert-templates-to-haml' into next-tech-1
Diffstat (limited to 'source/aktuelles/index.html.erb')
| -rw-r--r-- | source/aktuelles/index.html.erb | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/source/aktuelles/index.html.erb b/source/aktuelles/index.html.erb deleted file mode 100644 index 7fad840..0000000 --- a/source/aktuelles/index.html.erb +++ /dev/null @@ -1,35 +0,0 @@ ---- -section: "aktuelles" ---- - -<div> - <h3>Demnächst im sublab</h3> - - <p>BattleMeshV7 - 12. bis 18. Mai 2014</p> - <p>CryptoCon14 - 22. bis 25. Mai 2014</p> -</div> - -<div> - <h3>Neues aus dem sublab</h3> - - <p><%= link_to "Alle News >>", "/news.html" %></p> - <%= partial "article_summary", collection: blog.articles[0..2] %> -</div> - -<div> - <h3>@sublab tweets</h3> - <p> - <strong>sublab</strong> @sublab Apr 5<br> - WTF? LOL! - </p> - <p> - <strong>about:radio</strong> @aboutradio Apr 5<br> - Heute von 16-18Uhr: about:radio u.a. zu den Themen: Libre Graphics Meeting in Leipzig, Kamera in der Simildenstrasse - </p> -</div> - -<div> - <h3>Wiki Aktivität</h3> - <%= partial "wiki_changes" %> -</div> - |