Merge branch 'main' into 40c3
Resolves conflicts in content/{de,en}/_index.md: keeps the 40C3 launch
text from 40c3 over main's "coming soon" teaser, and takes main's
"Hackertours" spelling and front matter (#68).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
commit
32762bc22f
1 changed files with 507 additions and 100 deletions
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
title: Hamburg Hackertours (en)
|
||||
title: Welcome to Hamburg Hackertours!
|
||||
menus:
|
||||
main:
|
||||
name: Home
|
||||
|
|
@ -7,9 +7,8 @@ weight: 1
|
|||
params:
|
||||
headline: Welcome to Hackertours!
|
||||
intro: |
|
||||
For Congress and for Easterhegg CCC Hamburg is organizing tours to interesting places in and around Hamburg. Here you will find information about current and past events!
|
||||
logowidth: 500
|
||||
logoheight: 500
|
||||
For Congress and for Easterhegg CCC Hamburg is organizing tours to interesting places in and around Hamburg.
|
||||
Here you will find information about current and past events!
|
||||
cascade:
|
||||
params:
|
||||
intro: Let Hamburg Hackertours show you around the city!
|
||||
|
|
@ -17,9 +16,9 @@ cascade:
|
|||
|
||||
For [40C3](https://events.ccc.de/category/40c3/) we have found interesting places in and around Hamburg where you can delve into other worlds and experience fascinating things for a few hours. [We are going to explain how this works here in our FAQ article]({{< relref "faq/_index" >}})!
|
||||
|
||||
HackerTours is also on **[Mastodon](https://chaos.social/@hackertours)**!
|
||||
Hackertours is also on **[Mastodon](https://chaos.social/@hackertours)**!
|
||||
|
||||
**[All 40C3 Tours]({{< relref "40c3" >}})** - **[Directly to the HackerTours Ticket Shop](https://tickets.hamburg.ccc.de/hackertours/40c3ht)**
|
||||
**[All 40C3 Tours]({{< relref "40c3" >}})** - **[Directly to the Hackertours Ticket Shop](https://tickets.hamburg.ccc.de/hackertours/40c3ht)**
|
||||
|
||||
Hackertours Desk: DECT 8687 "TOUR", +49 40 573 0830 8687
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue