rebase to upstream

Author: graial

_data/meetups.yml

@@ -3526,6 +3526,13 @@
   end_time: 21:00:00 EST
   url: https://www.meetup.com/nyc-rb/events/304976995
 
+- name: Toulouse.rb - Conf & Apéro - Décembre
+  location: Toulouse, France
+  date: 2024-12-17
+  start_time: 18:30:00 CET
+  end_time: 20:30:00 CET
+  url: https://www.meetup.com/toulouse-ruby-friends/events/304627678
+
 - name: Portland Ruby Brigade - Cocktails + Code December 2024
   location: Portland, OR
   date: 2024-12-18
@@ -3840,6 +3847,13 @@
   end_time: 21:30:00 EST
   url: https://www.meetup.com/montrealrb/events/305005846
 
+- name: Geneva.rb - TBA January 2025
+  location: Genève, Switzerland
+  date: 2025-01-15
+  start_time: 19:00:00 CET
+  end_time: 21:00:00 CET
+  url: https://www.meetup.com/geneva-rb/events/304627310
+
 - name: Portland Ruby Brigade - Cocktails + Code January 2025
   location: Portland, OR
   date: 2025-01-15
@@ -4450,6 +4464,13 @@
   end_time: 21:00:00 CET
   url: https://www.meetup.com/geneva-rb/events/304629277
 
+- name: Geneva.rb - TBA March 2025
+  location: Genève, Switzerland
+  date: 2025-03-12
+  start_time: 19:00:00 CET
+  end_time: 21:00:00 CET
+  url: https://www.meetup.com/geneva-rb/events/304629277
+
 - name: Indianapolis Ruby Brigade - Monthly Meetup March 2025
   location: Indianapolis, IN
   date: 2025-03-12
@@ -4945,4 +4966,6 @@
   date: 2025-05-20
   start_time: 18:30:00 EST
   end_time: 20:00:00 EST
-  url: https://www.meetup.com/rubyjax/events/llklbtyhchbbc
+  url: https://www.meetup.com/rubyjax/events/llklbtyhchbbc
+=======
+>>>>>>> c20fc23 (Meetup Updates from Geneva.rb, London Ruby, Orange County, Philly.rb and more (#861))