diff options
author | Ahmad Ainul Rizki <human@shitiomatic.email> | 2020-06-07 12:06:56 +0300 |
---|---|---|
committer | Ahmad Ainul Rizki <human@shitiomatic.email> | 2020-06-07 12:06:56 +0300 |
commit | f51a09eafc1820e994933342d84ce50381d88103 (patch) | |
tree | f96070557662e96ca3d6f97375d1a45ef54bf95e /data | |
parent | b80298c1c91ca6dfc921083d62d3c7d7aaaa773c (diff) | |
parent | 161ec0883ff35e18b152c7ed5d81856f20534b57 (diff) |
Fix conflict
Diffstat (limited to 'data')
-rw-r--r-- | data/oss_projects.yml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/data/oss_projects.yml b/data/oss_projects.yml index 13b32f1..3d984c4 100644 --- a/data/oss_projects.yml +++ b/data/oss_projects.yml @@ -2355,7 +2355,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 +2369,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' @@ -2384,7 +2384,12 @@ project_description: "LOFAR (Low Frequency Array) is currently the largest radio telescope operating at the lowest frequencies that can be observed from Earth. Unlike single-dish telescope, LOFAR is a multipurpose sensor network, with an innovative computer and network infrastructure that can handle extremely large data volumes." 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: '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' |