rebase to upstream

Author: graial

_data/meetup_groups.yml

@@ -971,7 +971,7 @@
 - id: sthlmrb
   name: Stockholm Ruby
   service: meetupdotcom
-  
+
 - id: sthlmrb
   name: Stockholm Ruby
   service: luma

_data/meetups.yml

@@ -2672,8 +2672,8 @@
 - name: 'NYC.rb - API: World 2024 Online'
   location: Online
   date: 2024-11-12
-  start_time: 10:00:00 EDT
-  end_time: 17:00:00 EDT
+  start_time: 10:00:00 EST
+  end_time: 17:00:00 EST
   url: https://www.meetup.com/nyc-rb/events/303935276
 
 - name: Philly.rb - Pubnite November 2024
@@ -2873,6 +2873,7 @@
   date: 2024-11-19
   start_time: 17:00:00 PST
   end_time: 21:00:00 PST
+<<<<<<< HEAD
   url: https://lu.ma/f4pfsigc
 
 - name: South West Ruby - informal meetup
@@ -2894,6 +2895,8 @@
   date: 2024-11-19
   start_time: 17:00:00 PDT
   end_time: 21:00:00 PDT
+=======
+>>>>>>> 15d725e (Meetup Updates from African Ruby, Atlanta Ruby, Austin.rb, B'more on Rails, and more (#837))
   url: https://lu.ma/f4pfsigc
 
 - name: South West Ruby - informal meetup
@@ -2934,8 +2937,8 @@
 - name: VanRuby - Thinkific
   location: Vancouver, Canada
   date: 2024-11-20
-  start_time: 19:00:00 PDT
-  end_time: 21:00:00 PDT
+  start_time: 19:00:00 PST
+  end_time: 21:00:00 PST
   url: https://www.meetup.com/vancouver-ruby/events/303769344
 
 - name: West Midlands Ruby User Group - Monthly Meetup November 2024
@@ -3004,8 +3007,8 @@
 - name: Ottawa Ruby - November '24
   location: Ottawa, Canada
   date: 2024-11-26
-  start_time: 18:00:00 EDT
-  end_time: 20:00:00 EDT
+  start_time: 18:00:00 EST
+  end_time: 20:00:00 EST
   url: https://www.meetup.com/ottawaruby/events/304117874
 
 - name: RubyJax - Open Hax November 2024
@@ -4061,8 +4064,8 @@
 - name: RubyJax - Open Hax February 2025
   location: Jacksonville, FL
   date: 2025-02-04
-  start_time: 18:30:00 EDT
-  end_time: 20:00:00 EDT
+  start_time: 18:30:00 EST
+  end_time: 20:00:00 EST
   url: https://www.meetup.com/rubyjax/events/llklbtyhcdbgb
 
 - name: Prague.rb - First Wednesday Of The Month - Ruby February 2025