diff options
| author | marcahosse <regis.marcahosse@gmail.com> | 2020-07-08 10:22:07 +0300 |
|---|---|---|
| committer | marcahosse <regis.marcahosse@gmail.com> | 2020-07-08 10:22:07 +0300 |
| commit | 1574db89d2dcad23a7ee1ca91ec97c801967847f (patch) | |
| tree | 482eae5ff4d935f1e8e31d67d35eb6211a546879 | |
| parent | 2d32400129c14a99c93bb1bb7cd2fc904224bdf3 (diff) | |
| parent | d5bc816f696d8cf8cf25167a9d15603ad923e32d (diff) | |
Merge branch 'master' into 'siger-master-patch-30455'
# Conflicts:
# data/oss_projects.yml
| -rw-r--r-- | data/oss_projects.yml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/data/oss_projects.yml b/data/oss_projects.yml index d1931a9..1d5b96f 100644 --- a/data/oss_projects.yml +++ b/data/oss_projects.yml @@ -2451,8 +2451,7 @@ project_url: 'http://projects.knmi.nl/turbowin/' gitlab_plan: Gold - - project_name: 'OpenHiveManager' - project_description: 'An open-source and participative application beekeeping' - project_url: 'https://gitlab.com/siger/openhivemanager' + project_name: 'AICP' + project_description: 'A free and open-source rom, based on Android.' + project_url: 'https://www.aicp-rom.com/' gitlab_plan: Gold -- |