diff options
author | Borivoje Tasovac <btasovac@gitlab.com> | 2019-03-13 18:24:44 +0300 |
---|---|---|
committer | Borivoje Tasovac <btasovac@gitlab.com> | 2019-03-13 18:24:44 +0300 |
commit | 418dba396a66109a79022fc077bb7af8c41dae53 (patch) | |
tree | f166c149383ec84039f6fabd02591257145d9465 | |
parent | dd10fdf07b77bfc1a903dce851cd6612ba72f011 (diff) | |
parent | 832cf553b59de40510873dc00804d7faf86e9414 (diff) |
Fix merge conflicts
-rw-r--r-- | data/oss_projects.yml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/data/oss_projects.yml b/data/oss_projects.yml index b3eee84..b6df730 100644 --- a/data/oss_projects.yml +++ b/data/oss_projects.yml @@ -1278,7 +1278,6 @@ project_description: 'Free and Open Source Public Web CDN for web developer! ' project_url: 'https://cdnjs.com' gitlab_plan: Ultimate - - project_name: 'Flask-HTMLmin' project_description: 'Flask html response minifier' @@ -1289,3 +1288,8 @@ project_description: 'Free and Open Source 5zig plugin, adding HiveMC functionality.' project_url: 'https://beezig.eu' gitlab_plan: Gold +- + project_name: 'Sati Pasala' + project_description: 'The Sati Pasala Foundation aims at sharing mindfulness with students, teachers, and school and university communities, as well as those in other relevant sectors. The Foundation a non-profit Organisation, which is non-income generating, and is entirely managed through donor funding. ' + project_url: 'https://www.satipasala.org' + gitlab_plan: Ultimate
\ No newline at end of file |