Skip to content

Commit

Permalink
Merge branch 'main' into avogbbjxtopombtibwm
Browse files Browse the repository at this point in the history
  • Loading branch information
cgrail authored Dec 21, 2024
2 parents 5108f8b + b2a294c commit 734d140
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 1 deletion.
26 changes: 25 additions & 1 deletion conferences/2025/leadership.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,31 @@
"twitter": "@ctocraft"
},
{
"name": "Damian Martone",
"name": "Leadership Ateliers Lisbon",
"url": "https://www.leadershipateliers.com/lisbon",
"startDate": "2025-04-23",
"endDate": "2025-04-24",
"city": "Lisbon",
"country": "Portugal",
"online": false,
"locales": "EN",
"cocUrl": "https://www.hatchconference.com/code-of-conduct",
"twitter": "@hatchconference"
},
{
"name": "Leadership Ateliers Barcelona",
"url": "https://www.leadershipateliers.com/barcelona",
"startDate": "2025-05-05",
"endDate": "2025-05-06",
"city": "Barcelona",
"country": "Spain",
"online": false,
"locales": "EN",
"cocUrl": "https://www.hatchconference.com/code-of-conduct",
"twitter": "@hatchconference"
},
{
"name": "Leadership Ateliers Berlin",
"url": "https://www.leadershipateliers.com/berlin",
"startDate": "2025-05-21",
"endDate": "2025-05-22",
Expand Down
24 changes: 24 additions & 0 deletions conferences/2025/ux.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,30 @@
"offersSignLanguageOrCC": true,
"cocUrl": "https://conveyux.com/conveyux-code-conduct/"
},
{
"name": "Leadership Ateliers Lisbon",
"url": "https://www.leadershipateliers.com/lisbon",
"startDate": "2025-04-23",
"endDate": "2025-04-24",
"city": "Lisbon",
"country": "Portugal",
"online": false,
"locales": "EN",
"cocUrl": "https://www.hatchconference.com/code-of-conduct",
"twitter": "@hatchconference"
},
{
"name": "Leadership Ateliers Barcelona",
"url": "https://www.leadershipateliers.com/barcelona",
"startDate": "2025-05-05",
"endDate": "2025-05-06",
"city": "Barcelona",
"country": "Spain",
"online": false,
"locales": "EN",
"cocUrl": "https://www.hatchconference.com/code-of-conduct",
"twitter": "@hatchconference"
},
{
"name": "UXDX",
"url": "https://uxdx.com/usa/2025",
Expand Down

0 comments on commit 734d140

Please sign in to comment.