From 7dd7e357792ee1c44bc6411b68d7f0d4680e62e5 Mon Sep 17 00:00:00 2001
From: confs-tech-bot <37353062+confs-tech-bot@users.noreply.github.com>
Date: Mon, 9 Dec 2024 11:44:31 -0500
Subject: [PATCH 1/2] Add CityJS Athens for javascript

---
 conferences/2025/javascript.json | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/conferences/2025/javascript.json b/conferences/2025/javascript.json
index 6c5236018..72fc4b6ea 100644
--- a/conferences/2025/javascript.json
+++ b/conferences/2025/javascript.json
@@ -179,6 +179,21 @@
     "cocUrl": "https://javascript-conference.com/code-of-conduct/",
     "twitter": "@JavaScriptCon"
   },
+  {
+    "name": "CityJS Athens",
+    "url": "https://athens.cityjsconf.org",
+    "startDate": "2025-05-27",
+    "endDate": "2025-05-31",
+    "city": "Athens",
+    "country": "Greece",
+    "online": false,
+    "locales": "EN",
+    "offersSignLanguageOrCC": true,
+    "cocUrl": "https://athens.cityjsconf.org/coc",
+    "cfpUrl": "https://athens.cityjsconf.org",
+    "cfpEndDate": "2025-01-31",
+    "twitter": "@cityjsconf"
+  },
   {
     "name": "App.js Conference",
     "url": "https://appjs.co",

From 93b05cfa8b2b645ec20a255f67e4ca0053643dee Mon Sep 17 00:00:00 2001
From: Christian Grail <cgrail@users.noreply.github.com>
Date: Tue, 10 Dec 2024 14:50:01 +0100
Subject: [PATCH 2/2] Update javascript.json

---
 conferences/2025/javascript.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conferences/2025/javascript.json b/conferences/2025/javascript.json
index 72fc4b6ea..9304b49d9 100644
--- a/conferences/2025/javascript.json
+++ b/conferences/2025/javascript.json
@@ -190,7 +190,7 @@
     "locales": "EN",
     "offersSignLanguageOrCC": true,
     "cocUrl": "https://athens.cityjsconf.org/coc",
-    "cfpUrl": "https://athens.cityjsconf.org",
+    "cfpUrl": "https://docs.google.com/forms/d/e/1FAIpQLSe8O9l3COlO-Nr6qqS4dDlir8uw_4G2gZ2OQ5-KehuZkE6FCQ/viewform",
     "cfpEndDate": "2025-01-31",
     "twitter": "@cityjsconf"
   },