mirror of
https://github.com/YunoHost-Apps/mastodon_ynh.git
synced 2024-09-03 19:46:02 +02:00
Clean
This commit is contained in:
parent
bcf1d5d3d4
commit
625471149e
1 changed files with 0 additions and 13 deletions
|
@ -32,19 +32,6 @@
|
||||||
"example": "domain.org"
|
"example": "domain.org"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
<<<<<<< HEAD
|
|
||||||
"name": "path",
|
|
||||||
"type": "path",
|
|
||||||
"ask": {
|
|
||||||
"en": "Choose a path for Mastodon",
|
|
||||||
"fr": "Choisissez un chemin pour Mastodon"
|
|
||||||
},
|
|
||||||
"example": "/",
|
|
||||||
"default": "/"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
=======
|
|
||||||
>>>>>>> refs/remotes/YunoHost-Apps/master
|
|
||||||
"name": "admin",
|
"name": "admin",
|
||||||
"type": "user",
|
"type": "user",
|
||||||
"ask": {
|
"ask": {
|
||||||
|
|
Loading…
Add table
Reference in a new issue