Skip to content

Commit

Permalink
Merge pull request #7034 from tech-conferences/dparyctawvrcsxdysux
Browse files Browse the repository at this point in the history
Add DevOpsCon Berlin for devops, dotnet, general
  • Loading branch information
JuanPabloDiaz authored Jul 15, 2024
2 parents bb71c28 + d59388c commit 7815657
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 0 deletions.
12 changes: 12 additions & 0 deletions conferences/2025/devops.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,18 @@
"twitter": "@jcon_conference",
"mastodon": "@jcon@mastodon.social"
},
{
"name": "DevOpsCon Berlin",
"url": "https://devopscon.io/berlin",
"startDate": "2025-06-16",
"endDate": "2025-06-19",
"city": "Berlin",
"country": "Germany",
"online": true,
"locales": "EN",
"cocUrl": "https://devopscon.io/code-of-conduct",
"twitter": "@devops_con"
},
{
"name": "KubeCon + CloudNativeCon North America",
"url": "https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america-2025/",
Expand Down
12 changes: 12 additions & 0 deletions conferences/2025/dotnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,17 @@
"online": false,
"cocUrl": "https://futuretech.nl/code-of-conduct/",
"twitter": "@futuretechnl"
},
{
"name": "DevOpsCon Berlin",
"url": "https://devopscon.io/berlin",
"startDate": "2025-06-16",
"endDate": "2025-06-19",
"city": "Berlin",
"country": "Germany",
"online": true,
"locales": "EN",
"cocUrl": "https://devopscon.io/code-of-conduct",
"twitter": "@devops_con"
}
]
12 changes: 12 additions & 0 deletions conferences/2025/general.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,17 @@
"locales": "EN",
"cocUrl": "https://renderatl.com/code-of-conduct",
"twitter": "@RenderATL"
},
{
"name": "DevOpsCon Berlin",
"url": "https://devopscon.io/berlin",
"startDate": "2025-06-16",
"endDate": "2025-06-19",
"city": "Berlin",
"country": "Germany",
"online": true,
"locales": "EN",
"cocUrl": "https://devopscon.io/code-of-conduct",
"twitter": "@devops_con"
}
]

0 comments on commit 7815657

Please sign in to comment.