Merge branch 'staging' into 'production'
Staging See merge request cccb/www!38
This commit is contained in:
commit
5962f0c805
|
@ -28,6 +28,8 @@ permalinks:
|
||||||
Author:
|
Author:
|
||||||
twitter: "clubdiscordia"
|
twitter: "clubdiscordia"
|
||||||
email: "mail2021@berlin.ccc.de"
|
email: "mail2021@berlin.ccc.de"
|
||||||
|
mastodon: "chaos.social/@clubdiscordia"
|
||||||
|
irc: "https://webirc.hackint.org/#ircs://irc.hackint.org/#cccb"
|
||||||
|
|
||||||
menu:
|
menu:
|
||||||
main:
|
main:
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit f2c4132716d4dbf826fd95725f841a2a59d2f433
|
Subproject commit 0da13d20d0bf3c9002651f06a54d21608d292958
|
Loading…
Reference in a new issue