-conflits resolve

This commit is contained in:
Emile NDAGIJIMANA 2021-06-14 15:11:21 +02:00
parent 688ef08cd5
commit 080fcb9c62
141 changed files with 4856 additions and 931 deletions

View file

@ -1,6 +1,6 @@
{
"name": "wekan",
"version": "v5.32.0",
"version": "v5.34.0",
"description": "Open-Source kanban",
"private": true,
"repository": {