From 288c2f4b09a14331b92c4b798e9743c30634b903 Mon Sep 17 00:00:00 2001
From: confs-tech-bot <37353062+confs-tech-bot@users.noreply.github.com>
Date: Tue, 26 Jun 2018 06:15:48 -0400
Subject: [PATCH 1/3] Add JS Conf Armenia conference

---
 conferences/2018/javascript.json | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/conferences/2018/javascript.json b/conferences/2018/javascript.json
index 2687530..1dec367 100644
--- a/conferences/2018/javascript.json
+++ b/conferences/2018/javascript.json
@@ -1532,5 +1532,16 @@
     "twitter": null,
     "cfpUrl": "",
     "cfpEndDate": null
+  },
+  {
+    "name": "JS Conf Armenia",
+    "url": "https://jsconf.am",
+    "startDate": "2018-11-03",
+    "endDate": "2018-11-03",
+    "city": "Yerevan",
+    "country": "Armenia",
+    "twitter": "@jsconf.am",
+    "cfpUrl": "",
+    "cfpEndDate": null
   }
 ]
\ No newline at end of file

From f125bbfd9b3ff87bfbddaa41a79eb941de974535 Mon Sep 17 00:00:00 2001
From: Ekaterina Prigara <ekaterina@prigara.com>
Date: Tue, 26 Jun 2018 13:29:58 +0200
Subject: [PATCH 2/3] Fixed name

---
 conferences/2018/javascript.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conferences/2018/javascript.json b/conferences/2018/javascript.json
index 1dec367..5357b44 100644
--- a/conferences/2018/javascript.json
+++ b/conferences/2018/javascript.json
@@ -1534,7 +1534,7 @@
     "cfpEndDate": null
   },
   {
-    "name": "JS Conf Armenia",
+    "name": "JavaScript Conference Armenia",
     "url": "https://jsconf.am",
     "startDate": "2018-11-03",
     "endDate": "2018-11-03",
@@ -1544,4 +1544,4 @@
     "cfpUrl": "",
     "cfpEndDate": null
   }
-]
\ No newline at end of file
+]

From fc4bedeb0c7abe6b822dd7308f8c2efef8bbd191 Mon Sep 17 00:00:00 2001
From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com>
Date: Tue, 26 Jun 2018 21:08:07 -0700
Subject: [PATCH 3/3] Updated twitter of JSConf Armenia

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

diff --git a/conferences/2018/javascript.json b/conferences/2018/javascript.json
index 5357b44..1b0e051 100644
--- a/conferences/2018/javascript.json
+++ b/conferences/2018/javascript.json
@@ -1540,7 +1540,7 @@
     "endDate": "2018-11-03",
     "city": "Yerevan",
     "country": "Armenia",
-    "twitter": "@jsconf.am",
+    "twitter": "@jsconf_am",
     "cfpUrl": "",
     "cfpEndDate": null
   }