fix conflicts

This commit is contained in:
Peng Zhong 2015-12-10 06:34:21 +09:00
commit b33671f939
26 changed files with 52 additions and 1274 deletions

View File

@ -5117,7 +5117,7 @@
"source_url": "https://github.com/redmatrix/hubzilla",
"name": "Hubzilla",
"tos_url": "",
"url": "https://hubzilla.org/",
"url": "http://hubzilla.org/",
"wikipedia_url": "",
"protocols": [
"RSS",
@ -5137,7 +5137,7 @@
]
},
{
"name": "BSD",
"name": "Web Services",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
@ -5145,53 +5145,6 @@
"Productivity",
"Social Networks"
]
},
{
"name": "GNU/Linux",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "OS X",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Windows",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Android",
"subcategories": [
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "iOS",
"subcategories": [
"Media Publishing",
"Productivity",
"Social Networks"
]
}
],
"slug": "hubzilla"

View File

@ -5117,7 +5117,7 @@
"source_url": "https://github.com/redmatrix/hubzilla",
"name": "Hubzilla",
"tos_url": "",
"url": "https://hubzilla.org/",
"url": "http://hubzilla.org/",
"wikipedia_url": "",
"protocols": [
"RSS",
@ -5137,7 +5137,7 @@
]
},
{
"name": "BSD",
"name": "Web Services",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
@ -5145,53 +5145,6 @@
"Productivity",
"Social Networks"
]
},
{
"name": "GNU/Linux",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "OS X",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Windows",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Android",
"subcategories": [
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "iOS",
"subcategories": [
"Media Publishing",
"Productivity",
"Social Networks"
]
}
],
"slug": "hubzilla"

View File

@ -5117,7 +5117,7 @@
"source_url": "https://github.com/redmatrix/hubzilla",
"name": "Hubzilla",
"tos_url": "",
"url": "https://hubzilla.org/",
"url": "http://hubzilla.org/",
"wikipedia_url": "",
"protocols": [
"RSS",
@ -5137,7 +5137,7 @@
]
},
{
"name": "BSD",
"name": "Web Services",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
@ -5145,53 +5145,6 @@
"Productivity",
"Social Networks"
]
},
{
"name": "GNU/Linux",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "OS X",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Windows",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Android",
"subcategories": [
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "iOS",
"subcategories": [
"Media Publishing",
"Productivity",
"Social Networks"
]
}
],
"slug": "hubzilla"

View File

@ -5117,7 +5117,7 @@
"source_url": "https://github.com/redmatrix/hubzilla",
"name": "Hubzilla",
"tos_url": "",
"url": "https://hubzilla.org/",
"url": "http://hubzilla.org/",
"wikipedia_url": "",
"protocols": [
"RSS",
@ -5137,7 +5137,7 @@
]
},
{
"name": "BSD",
"name": "Web Services",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
@ -5145,53 +5145,6 @@
"Productivity",
"Social Networks"
]
},
{
"name": "GNU/Linux",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "OS X",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Windows",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Android",
"subcategories": [
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "iOS",
"subcategories": [
"Media Publishing",
"Productivity",
"Social Networks"
]
}
],
"slug": "hubzilla"

View File

@ -5117,7 +5117,7 @@
"source_url": "https://github.com/redmatrix/hubzilla",
"name": "Hubzilla",
"tos_url": "",
"url": "https://hubzilla.org/",
"url": "http://hubzilla.org/",
"wikipedia_url": "",
"protocols": [
"RSS",
@ -5137,7 +5137,7 @@
]
},
{
"name": "BSD",
"name": "Web Services",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
@ -5145,53 +5145,6 @@
"Productivity",
"Social Networks"
]
},
{
"name": "GNU/Linux",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "OS X",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Windows",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Android",
"subcategories": [
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "iOS",
"subcategories": [
"Media Publishing",
"Productivity",
"Social Networks"
]
}
],
"slug": "hubzilla"

View File

@ -5117,7 +5117,7 @@
"source_url": "https://github.com/redmatrix/hubzilla",
"name": "Hubzilla",
"tos_url": "",
"url": "https://hubzilla.org/",
"url": "http://hubzilla.org/",
"wikipedia_url": "",
"protocols": [
"RSS",
@ -5137,7 +5137,7 @@
]
},
{
"name": "BSD",
"name": "Web Services",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
@ -5145,53 +5145,6 @@
"Productivity",
"Social Networks"
]
},
{
"name": "GNU/Linux",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "OS X",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Windows",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Android",
"subcategories": [
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "iOS",
"subcategories": [
"Media Publishing",
"Productivity",
"Social Networks"
]
}
],
"slug": "hubzilla"

View File

@ -5117,7 +5117,7 @@
"source_url": "https://github.com/redmatrix/hubzilla",
"name": "Hubzilla",
"tos_url": "",
"url": "https://hubzilla.org/",
"url": "http://hubzilla.org/",
"wikipedia_url": "",
"protocols": [
"RSS",
@ -5137,7 +5137,7 @@
]
},
{
"name": "BSD",
"name": "Web Services",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
@ -5145,53 +5145,6 @@
"Productivity",
"Social Networks"
]
},
{
"name": "GNU/Linux",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "OS X",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Windows",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Android",
"subcategories": [
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "iOS",
"subcategories": [
"Media Publishing",
"Productivity",
"Social Networks"
]
}
],
"slug": "hubzilla"

View File

@ -5117,7 +5117,7 @@
"source_url": "https://github.com/redmatrix/hubzilla",
"name": "Hubzilla",
"tos_url": "",
"url": "https://hubzilla.org/",
"url": "http://hubzilla.org/",
"wikipedia_url": "",
"protocols": [
"RSS",
@ -5137,7 +5137,7 @@
]
},
{
"name": "BSD",
"name": "Web Services",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
@ -5145,53 +5145,6 @@
"Productivity",
"Social Networks"
]
},
{
"name": "GNU/Linux",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "OS X",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Windows",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Android",
"subcategories": [
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "iOS",
"subcategories": [
"Media Publishing",
"Productivity",
"Social Networks"
]
}
],
"slug": "hubzilla"

View File

@ -5117,7 +5117,7 @@
"source_url": "https://github.com/redmatrix/hubzilla",
"name": "Hubzilla",
"tos_url": "",
"url": "https://hubzilla.org/",
"url": "http://hubzilla.org/",
"wikipedia_url": "",
"protocols": [
"RSS",
@ -5137,7 +5137,7 @@
]
},
{
"name": "BSD",
"name": "Web Services",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
@ -5145,53 +5145,6 @@
"Productivity",
"Social Networks"
]
},
{
"name": "GNU/Linux",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "OS X",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Windows",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Android",
"subcategories": [
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "iOS",
"subcategories": [
"Media Publishing",
"Productivity",
"Social Networks"
]
}
],
"slug": "hubzilla"

View File

@ -5117,7 +5117,7 @@
"source_url": "https://github.com/redmatrix/hubzilla",
"name": "Hubzilla",
"tos_url": "",
"url": "https://hubzilla.org/",
"url": "http://hubzilla.org/",
"wikipedia_url": "",
"protocols": [
"RSS",
@ -5137,7 +5137,7 @@
]
},
{
"name": "BSD",
"name": "Web Services",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
@ -5145,53 +5145,6 @@
"Productivity",
"Social Networks"
]
},
{
"name": "GNU/Linux",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "OS X",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Windows",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Android",
"subcategories": [
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "iOS",
"subcategories": [
"Media Publishing",
"Productivity",
"Social Networks"
]
}
],
"slug": "hubzilla"

View File

@ -5117,7 +5117,7 @@
"source_url": "https://github.com/redmatrix/hubzilla",
"name": "Hubzilla",
"tos_url": "",
"url": "https://hubzilla.org/",
"url": "http://hubzilla.org/",
"wikipedia_url": "",
"protocols": [
"RSS",
@ -5137,7 +5137,7 @@
]
},
{
"name": "BSD",
"name": "Web Services",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
@ -5145,53 +5145,6 @@
"Productivity",
"Social Networks"
]
},
{
"name": "GNU/Linux",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "OS X",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Windows",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Android",
"subcategories": [
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "iOS",
"subcategories": [
"Media Publishing",
"Productivity",
"Social Networks"
]
}
],
"slug": "hubzilla"

View File

@ -5117,7 +5117,7 @@
"source_url": "https://github.com/redmatrix/hubzilla",
"name": "Hubzilla",
"tos_url": "",
"url": "https://hubzilla.org/",
"url": "http://hubzilla.org/",
"wikipedia_url": "",
"protocols": [
"RSS",
@ -5137,7 +5137,7 @@
]
},
{
"name": "BSD",
"name": "Web Services",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
@ -5145,53 +5145,6 @@
"Productivity",
"Social Networks"
]
},
{
"name": "GNU/Linux",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "OS X",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Windows",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Android",
"subcategories": [
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "iOS",
"subcategories": [
"Media Publishing",
"Productivity",
"Social Networks"
]
}
],
"slug": "hubzilla"

View File

@ -5117,7 +5117,7 @@
"source_url": "https://github.com/redmatrix/hubzilla",
"name": "Hubzilla",
"tos_url": "",
"url": "https://hubzilla.org/",
"url": "http://hubzilla.org/",
"wikipedia_url": "",
"protocols": [
"RSS",
@ -5137,7 +5137,7 @@
]
},
{
"name": "BSD",
"name": "Web Services",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
@ -5145,53 +5145,6 @@
"Productivity",
"Social Networks"
]
},
{
"name": "GNU/Linux",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "OS X",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Windows",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Android",
"subcategories": [
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "iOS",
"subcategories": [
"Media Publishing",
"Productivity",
"Social Networks"
]
}
],
"slug": "hubzilla"

View File

@ -5117,7 +5117,7 @@
"source_url": "https://github.com/redmatrix/hubzilla",
"name": "Hubzilla",
"tos_url": "",
"url": "https://hubzilla.org/",
"url": "http://hubzilla.org/",
"wikipedia_url": "",
"protocols": [
"RSS",
@ -5137,7 +5137,7 @@
]
},
{
"name": "BSD",
"name": "Web Services",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
@ -5145,53 +5145,6 @@
"Productivity",
"Social Networks"
]
},
{
"name": "GNU/Linux",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "OS X",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Windows",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Android",
"subcategories": [
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "iOS",
"subcategories": [
"Media Publishing",
"Productivity",
"Social Networks"
]
}
],
"slug": "hubzilla"

View File

@ -5117,7 +5117,7 @@
"source_url": "https://github.com/redmatrix/hubzilla",
"name": "Hubzilla",
"tos_url": "",
"url": "https://hubzilla.org/",
"url": "http://hubzilla.org/",
"wikipedia_url": "",
"protocols": [
"RSS",
@ -5137,7 +5137,7 @@
]
},
{
"name": "BSD",
"name": "Web Services",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
@ -5145,53 +5145,6 @@
"Productivity",
"Social Networks"
]
},
{
"name": "GNU/Linux",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "OS X",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Windows",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Android",
"subcategories": [
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "iOS",
"subcategories": [
"Media Publishing",
"Productivity",
"Social Networks"
]
}
],
"slug": "hubzilla"

View File

@ -5117,7 +5117,7 @@
"source_url": "https://github.com/redmatrix/hubzilla",
"name": "Hubzilla",
"tos_url": "",
"url": "https://hubzilla.org/",
"url": "http://hubzilla.org/",
"wikipedia_url": "",
"protocols": [
"RSS",
@ -5137,7 +5137,7 @@
]
},
{
"name": "BSD",
"name": "Web Services",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
@ -5145,53 +5145,6 @@
"Productivity",
"Social Networks"
]
},
{
"name": "GNU/Linux",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "OS X",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Windows",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Android",
"subcategories": [
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "iOS",
"subcategories": [
"Media Publishing",
"Productivity",
"Social Networks"
]
}
],
"slug": "hubzilla"

View File

@ -5117,7 +5117,7 @@
"source_url": "https://github.com/redmatrix/hubzilla",
"name": "Hubzilla",
"tos_url": "",
"url": "https://hubzilla.org/",
"url": "http://hubzilla.org/",
"wikipedia_url": "",
"protocols": [
"RSS",
@ -5137,7 +5137,7 @@
]
},
{
"name": "BSD",
"name": "Web Services",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
@ -5145,53 +5145,6 @@
"Productivity",
"Social Networks"
]
},
{
"name": "GNU/Linux",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "OS X",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Windows",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Android",
"subcategories": [
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "iOS",
"subcategories": [
"Media Publishing",
"Productivity",
"Social Networks"
]
}
],
"slug": "hubzilla"

View File

@ -5117,7 +5117,7 @@
"source_url": "https://github.com/redmatrix/hubzilla",
"name": "Hubzilla",
"tos_url": "",
"url": "https://hubzilla.org/",
"url": "http://hubzilla.org/",
"wikipedia_url": "",
"protocols": [
"RSS",
@ -5137,7 +5137,7 @@
]
},
{
"name": "BSD",
"name": "Web Services",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
@ -5145,53 +5145,6 @@
"Productivity",
"Social Networks"
]
},
{
"name": "GNU/Linux",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "OS X",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Windows",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Android",
"subcategories": [
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "iOS",
"subcategories": [
"Media Publishing",
"Productivity",
"Social Networks"
]
}
],
"slug": "hubzilla"

View File

@ -5117,7 +5117,7 @@
"source_url": "https://github.com/redmatrix/hubzilla",
"name": "Hubzilla",
"tos_url": "",
"url": "https://hubzilla.org/",
"url": "http://hubzilla.org/",
"wikipedia_url": "",
"protocols": [
"RSS",
@ -5137,7 +5137,7 @@
]
},
{
"name": "BSD",
"name": "Web Services",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
@ -5145,53 +5145,6 @@
"Productivity",
"Social Networks"
]
},
{
"name": "GNU/Linux",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "OS X",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Windows",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Android",
"subcategories": [
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "iOS",
"subcategories": [
"Media Publishing",
"Productivity",
"Social Networks"
]
}
],
"slug": "hubzilla"

View File

@ -5117,7 +5117,7 @@
"source_url": "https://github.com/redmatrix/hubzilla",
"name": "Hubzilla",
"tos_url": "",
"url": "https://hubzilla.org/",
"url": "http://hubzilla.org/",
"wikipedia_url": "",
"protocols": [
"RSS",
@ -5137,7 +5137,7 @@
]
},
{
"name": "BSD",
"name": "Web Services",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
@ -5145,53 +5145,6 @@
"Productivity",
"Social Networks"
]
},
{
"name": "GNU/Linux",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "OS X",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Windows",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Android",
"subcategories": [
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "iOS",
"subcategories": [
"Media Publishing",
"Productivity",
"Social Networks"
]
}
],
"slug": "hubzilla"

View File

@ -5117,7 +5117,7 @@
"source_url": "https://github.com/redmatrix/hubzilla",
"name": "Hubzilla",
"tos_url": "",
"url": "https://hubzilla.org/",
"url": "http://hubzilla.org/",
"wikipedia_url": "",
"protocols": [
"RSS",
@ -5137,7 +5137,7 @@
]
},
{
"name": "BSD",
"name": "Web Services",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
@ -5145,53 +5145,6 @@
"Productivity",
"Social Networks"
]
},
{
"name": "GNU/Linux",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "OS X",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Windows",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Android",
"subcategories": [
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "iOS",
"subcategories": [
"Media Publishing",
"Productivity",
"Social Networks"
]
}
],
"slug": "hubzilla"

View File

@ -5117,7 +5117,7 @@
"source_url": "https://github.com/redmatrix/hubzilla",
"name": "Hubzilla",
"tos_url": "",
"url": "https://hubzilla.org/",
"url": "http://hubzilla.org/",
"wikipedia_url": "",
"protocols": [
"RSS",
@ -5137,7 +5137,7 @@
]
},
{
"name": "BSD",
"name": "Web Services",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
@ -5145,53 +5145,6 @@
"Productivity",
"Social Networks"
]
},
{
"name": "GNU/Linux",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "OS X",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Windows",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Android",
"subcategories": [
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "iOS",
"subcategories": [
"Media Publishing",
"Productivity",
"Social Networks"
]
}
],
"slug": "hubzilla"

View File

@ -5117,7 +5117,7 @@
"source_url": "https://github.com/redmatrix/hubzilla",
"name": "Hubzilla",
"tos_url": "",
"url": "https://hubzilla.org/",
"url": "http://hubzilla.org/",
"wikipedia_url": "",
"protocols": [
"RSS",
@ -5137,7 +5137,7 @@
]
},
{
"name": "BSD",
"name": "Web Services",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
@ -5145,53 +5145,6 @@
"Productivity",
"Social Networks"
]
},
{
"name": "GNU/Linux",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "OS X",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Windows",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Android",
"subcategories": [
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "iOS",
"subcategories": [
"Media Publishing",
"Productivity",
"Social Networks"
]
}
],
"slug": "hubzilla"

View File

@ -5117,7 +5117,7 @@
"source_url": "https://github.com/redmatrix/hubzilla",
"name": "Hubzilla",
"tos_url": "",
"url": "https://hubzilla.org/",
"url": "http://hubzilla.org/",
"wikipedia_url": "",
"protocols": [
"RSS",
@ -5137,7 +5137,7 @@
]
},
{
"name": "BSD",
"name": "Web Services",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
@ -5145,53 +5145,6 @@
"Productivity",
"Social Networks"
]
},
{
"name": "GNU/Linux",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "OS X",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Windows",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Android",
"subcategories": [
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "iOS",
"subcategories": [
"Media Publishing",
"Productivity",
"Social Networks"
]
}
],
"slug": "hubzilla"

View File

@ -5117,7 +5117,7 @@
"source_url": "https://github.com/redmatrix/hubzilla",
"name": "Hubzilla",
"tos_url": "",
"url": "https://hubzilla.org/",
"url": "http://hubzilla.org/",
"wikipedia_url": "",
"protocols": [
"RSS",
@ -5137,7 +5137,7 @@
]
},
{
"name": "BSD",
"name": "Web Services",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
@ -5145,53 +5145,6 @@
"Productivity",
"Social Networks"
]
},
{
"name": "GNU/Linux",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "OS X",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Windows",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Android",
"subcategories": [
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "iOS",
"subcategories": [
"Media Publishing",
"Productivity",
"Social Networks"
]
}
],
"slug": "hubzilla"

View File

@ -5117,7 +5117,7 @@
"source_url": "https://github.com/redmatrix/hubzilla",
"name": "Hubzilla",
"tos_url": "",
"url": "https://hubzilla.org/",
"url": "http://hubzilla.org/",
"wikipedia_url": "",
"protocols": [
"RSS",
@ -5137,7 +5137,7 @@
]
},
{
"name": "BSD",
"name": "Web Services",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
@ -5145,53 +5145,6 @@
"Productivity",
"Social Networks"
]
},
{
"name": "GNU/Linux",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "OS X",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Windows",
"subcategories": [
"Bookmark Sync",
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "Android",
"subcategories": [
"File Storage & Sync",
"Media Publishing",
"Productivity",
"Social Networks"
]
},
{
"name": "iOS",
"subcategories": [
"Media Publishing",
"Productivity",
"Social Networks"
]
}
],
"slug": "hubzilla"