Skip to content

Commit 0c4c587

Browse files
authored
Merge branch 'main' into tixurl
2 parents 9a063b4 + 498675b commit 0c4c587

24 files changed

Lines changed: 189 additions & 367 deletions

File tree

content/events/2020-buenos-aires/conduct.md

Lines changed: 0 additions & 28 deletions
This file was deleted.

content/events/2020-buenos-aires/contact.md

Lines changed: 0 additions & 14 deletions
This file was deleted.

content/events/2020-buenos-aires/location.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

content/events/2020-buenos-aires/propose.md

Lines changed: 0 additions & 35 deletions
This file was deleted.

content/events/2020-buenos-aires/registration.md

Lines changed: 0 additions & 11 deletions
This file was deleted.

content/events/2020-buenos-aires/sponsor.md

Lines changed: 0 additions & 46 deletions
This file was deleted.

content/events/2020-buenos-aires/welcome.md

Lines changed: 0 additions & 87 deletions
This file was deleted.

content/events/2025-chicago/welcome.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Description = "DevOpsDays Chicago is coming back in 2025! The group that brought
7878
<div class="form-check">
7979
<input class="form-check-input" type="checkbox" name="gdpr" id="gdpr">
8080
<label class="form-check-label" for="gdpr">
81-
<strong>Marketing permission</strong>: I give my consent to DevOpsDays Chicago to be in touch with me via email using the information I have provided in this form for the purpose of news, updates and marketing.
81+
<strong>Marketing permission</strong>: I give my consent to DevOpsDays Chicago to be in touch with me via email using the information I have provided in this form for the purpose of news, updates, and marketing, but ONLY related to the DevOpsDays Chicago event. The only emails sent to me will be directly related to the DevOpsDays Chicago event/conference.
8282
</label>
8383
</div>
8484
<span><strong>What to expect</strong>: If you wish to withdraw your consent and stop hearing from us, simply click the unsubscribe link at the bottom of every email we send or contact us at no-reply@devopsdays.org. We value and respect your personal data and privacy. To view our privacy policy, please visit our website. By submitting this form, you agree that we may process your information in accordance with these terms.</span>

data/events/2020/buenos-aires/main.yml

Lines changed: 0 additions & 105 deletions
This file was deleted.

data/events/2025/atlanta/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ organizer_email: "atlanta@devopsdays.org" # Put your organizer email address her
7777
sponsors:
7878
- id: arresteddevops
7979
level: community
80+
- id: spacelift
81+
level: gold
8082

8183
sponsors_accepted : "yes" # Whether you want "Become a XXX Sponsor!" link
8284

0 commit comments

Comments
 (0)