Merge branch 'master' into 'add-xonotic'

# Conflicts:
#   data/oss_projects.yml

1 files changed, 49 insertions, 2 deletions

diff --git a/data/oss_projects.yml b/data/oss_projects.yml
index 2681d37..8ddaf4c 100644
--- a/data/oss_projects.yml
+++ b/data/oss_projects.yml
@@ -1,4 +1,9 @@
 -
+    project_name: 'DrupalSpoons'
+    project_description: 'A group for contributed Drupal projects.'
+    project_url: 'https://gitlab.com/drupalspoons/webmasters'
+    gitlab_plan: Gold
+-
     project_name: 'PrivateTracer'
     project_description: 'Privacy by design: Contact Tracing App to break the chain of transmission during the covid-19 pandamic'
     project_url: 'https://www.privatetracer.org/'
@@ -2261,6 +2266,11 @@
     project_url: 'https://covid-ce.org/'
     gitlab_plan: Gold
 -
+    project_name: 'CoVerified'
+    project_description: "An embeddable tool providing verified information about the COVID-19 outbreak."
+    project_url: 'https://coverified.info/'
+    gitlab_plan: Ultimate
+-
     project_name: PudaPOS
     project_description: "A small free POS application for cafes and restaurants that can't afford or don't need huge restaurant software. It is a CS student project."
     project_url: 'https://gitlab.blep.cz/puda-pos'
@@ -2355,7 +2365,7 @@
     project_description: 'Upload/download files to a netsuite account, using the included restlet.'
     project_url: 'https://gitlab.com/tho-asterist/ns-cabinet'
     gitlab_plan: Gold
--   
+-
     project_name: 'Ninja Forms'
     project_description: 'A free and open WordPress plugin for creating forms without writing any code.'
     project_url: 'https://git.saturdaydrive.io/_/ninja-forms/ninja-forms/'
@@ -2369,7 +2379,7 @@
     project_name: 'BotNite'
     project_description: 'Discord bot intended for the TSHNN Discord server'
     project_url: 'https://gitlab.com/xboxliveparty/botnite'
-    gitlab_plan: Gold    
+    gitlab_plan: Gold
 -
     project_name: 'eParishes.com'
     project_description: 'An online platform for Catholic parishes'
@@ -2385,6 +2395,43 @@
     project_url: 'https://www.astron.nl/telescopes/lofar'
     gitlab_plan: Ultimate
 -
+    project_name: 'DECOV'
+    project_description: ‘Artificial Intelligence-based tool to search and optimize tradeoffs between sanitary and economy criteria of the COVID-19-lockdown measures liftings.'
+    project_url: 'https://gitlab.com/covid_dia/deconf'
+    gitlab_plan: Gold
+-
+    project_name: 'AZTECH Robotics'
+    project_description: 'FIRST Robotics Competition Team 6479 from Corona del Sol High School'
+    project_url: 'https://team6479.org'
+    gitlab_plan: Gold
+-
+    project_name: 'Nusantara Open Government'
+    project_description: "NusaOpenGov is a social experiment to test pure democratic governance, and rebuilding democracy using blockchain"
+    project_url: 'https://nusaopengov.tech'
+    gitlab_plan: Gold
+
+-
+    project_name: 'Pacific Data Hub'
+    project_description: "Harnessing the power of data and knowledge for sustainable development"
+    project_url: 'https://pacificdata.org'
+    gitlab_plan: Gold
+
+-
+    project_name: 'OAM'
+    project_description: "Application allowing first aid associations to centralize the documents necessary for first aid associations."
+    project_url: 'https://gitlab.com/inumps/oam'
+    gitlab_plan: Ultimate
+-
+    project_name: 'OpenGeoSys'
+    project_description: 'OpenGeoSys (OGS) is a scientific open source project for the development of numerical methods for the simulation of thermo-hydro-mechanical-chemical (THMC) processes in porous and fractured media.'
+    project_url: 'https://www.opengeosys.org/'
+    gitlab_plan: Ultimate
+-
+    project_name: 'Vapas'
+    project_description: 'An open-source, modern iOS APT repository designed to take full advantage of newer APT clients.'
+    project_url: 'https://gitlab.com/vapas'
+    gitlab_plan: Gold
+-
     project_name: 'Xonotic'
     project_description: "Xonotic is an addictive, arena-style first person shooter with crisp movement and a wide array of weapons."
     project_url: 'https://www.xonotic.org'