diff options
| author | marcahosse <regis.marcahosse@gmail.com> | 2020-07-07 17:38:36 +0300 |
|---|---|---|
| committer | marcahosse <regis.marcahosse@gmail.com> | 2020-07-07 17:38:36 +0300 |
| commit | 2d32400129c14a99c93bb1bb7cd2fc904224bdf3 (patch) | |
| tree | 474890f75407193dac3b774b7cc63e67d90e07dc | |
| parent | 609a02e41178d8338993e5a5c2e15a4cb3036d66 (diff) | |
| parent | 4df84012abc3ef3f83a0e6e76a51987bd6b4b30c (diff) | |
Merge branch 'master' into 'siger-master-patch-30455'
# Conflicts:
# data/oss_projects.yml
| -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 cef81de..d1931a9 100644 --- a/data/oss_projects.yml +++ b/data/oss_projects.yml @@ -293,7 +293,7 @@ project_description: 'An android app to get phone number location and other info.' project_url: 'https://github.com/xdtianyu/CallerInfo' gitlab_plan: Ultimate - - +- project_name: Cardano project_description: 'Cardano is a third-generation cryptocurrency and smart contract platform that claims to improve upon the scaling problems of bitcoin, a first-generation coin, and ethereum.' project_url: 'https://cardano.org' @@ -2384,6 +2384,7 @@ project_name: 'eParishes.com' project_description: 'An online platform for Catholic parishes' project_url: 'https://gitlab.com/eparishes.com' + gitlab_plan: Gold - project_name: 'Open Pit' project_description: 'A set of tools and protocols for various aspects of virtual event production' @@ -2409,13 +2410,11 @@ 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." @@ -2436,6 +2435,11 @@ 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' gitlab_plan: Ultimate +- + project_name: 'ThingsCafe_public' + project_description: 'An open-source IOT multi-tenant service platform and PWA' + project_url: 'https://gitlab.com/thingscafe_public/thingscafe_public' + gitlab_plan: Gold - project_name: 'Traffic3D' project_description: 'Traffic3D: A Rich 3D Traffic Environment to Train Intelligent Agents.' @@ -2451,3 +2455,4 @@ project_description: 'An open-source and participative application beekeeping' project_url: 'https://gitlab.com/siger/openhivemanager' gitlab_plan: Gold +- |