rebase to upstream

Author: graial

_data/meetup_groups.yml

@@ -47,10 +47,14 @@
   remove:
     - "[VIRTUAL] "
     - "[ATLRUG Virtual]"
+<<<<<<< HEAD
 <<<<<<< HEAD
     - "[ATLRUG]"
 =======
 >>>>>>> a8d50df (Meetup Updates from African Ruby, Atlanta Ruby, DenHaag.rb, NYC.rb and more (#851))
+=======
+    - "[ATLRUG]"
+>>>>>>> aa7543f (Meetup Updates from Atlanta Ruby, Charlotte Ruby, Columbus Ruby, Miami Ruby and more (#856))
     - "The Atlanta Ruby Meetup Group"
 
 - id: aucklandruby

_data/meetups.yml

@@ -2788,7 +2788,7 @@
   end_time: 20:30:00 CET
   url: https://www.meetup.com/rzeszow-ruby-user-group/events/304395509
 
-- name: 'Vilnius.rb - open lecture at VilniusTech.'
+- name: Vilnius.rb - open lecture at VilniusTech.
   location: Vilnius, Lithuania
   date: 2024-11-14
   start_time: 14:00:00 EET
@@ -3015,6 +3015,13 @@
   end_time: 20:00:00 EST
   url: https://www.meetup.com/ottawaruby/events/304117874
 
+- name: Ruby Zagreb - RubyZG November meetup @ Mews
+  location: Zagreb, Croatia
+  date: 2024-11-26
+  start_time: 18:00:00 CET
+  end_time: 19:30:00 CET
+  url: https://www.meetup.com/rubyzg/events/304582338
+
 - name: RubyJax - Open Hax November 2024
   location: Jacksonville, FL
   date: 2024-11-26
@@ -3882,6 +3889,13 @@
   end_time: 21:00:00 CET
   url: https://www.meetup.com/drugpl/events/305634530
 
+- name: SF Bay Area Ruby - SF Ruby January Meetup @ Productboard
+  location: San Francisco, CA
+  date: 2025-01-16
+  start_time: 17:00:00 PST
+  end_time: 21:00:00 PST
+  url: https://lu.ma/goujxu3a
+
 - name: Miami Ruby Brigade - January 2025
   location: Coral Gables, FL
   date: 2025-01-20