amaury_joly/mautrix_meta_ynh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix conflict

Browse Source
This commit is contained in:
Maniack Crudelis
2018-01-23 00:19:44 +01:00
committed by GitHub
parent 042ade8405
commit b31d6065d2
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
community.json
View File

@ -918,11 +918,12 @@
"state": "notworking", "state": "notworking",
"url": "https://github.com/YunoHost-Apps/pluxml_ynh" "url": "https://github.com/YunoHost-Apps/pluxml_ynh"
}, },
"Portainer": { "portainer": {
"branch": "master", "branch": "master",
"revision": "a7e7e2faa5bc21bd2c2685c958375a05d9ccf70b", "revision": "a7e7e2faa5bc21bd2c2685c958375a05d9ccf70b",
"state": "inprogress", "state": "inprogress",
"url": "https://github.com/aymhce/portainer_ynh" "url": "https://github.com/aymhce/portainer_ynh"
},
"prestashop": { "prestashop": {
"branch": "master", "branch": "master",
"revision": "34b6f2e2f33c528a411a5c1690ad7124c68bb6da", "revision": "34b6f2e2f33c528a411a5c1690ad7124c68bb6da",