Merge branch 'master' into wanshow

This commit is contained in:
Josh Moore 2020-08-24 08:55:09 -06:00 committed by GitHub
commit 3da53b31d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions

View File

@ -56,6 +56,7 @@ GitHub:
- [@SuperSandro2000](https://github.com/superSandro2000) - [@SuperSandro2000](https://github.com/superSandro2000)
- [@honorsea](https://github.com/honorsea) - [@honorsea](https://github.com/honorsea)
- [@chanana](https://github.com/chanana) - [@chanana](https://github.com/chanana)
- [@m0yP](https://github.com/m0yP)
Reddit: Reddit:

View File

@ -190,7 +190,7 @@ When contributing, **please try to follow the rules outlined in [CONTRIBUTING.md
| Name | Eyes | Description | | Name | Eyes | Description |
| ---- | ---- | ----------- | | ---- | ---- | ----------- |
| [Zoho](https://www.zoho.com/) | | Zoho was included in 2018's thread as well, and they've only improved since then. They offer a full enterprise business suite that can easily rival G Suite or MS Office 365. *Better description wanted* | | [Zoho](https://www.zoho.com/) | | Zoho was included in 2018's thread as well, and they've only improved since then. They offer a full enterprise business suite that can easily rival G Suite or MS Office 365. *Better description wanted* |
| [Nextcloud](https://www.nextcloud.com/) | | Nextcloud 18 now has Community Document Server and **[ONLYOFFICE](https://www.onlyoffice.com/)** apps integrated which allows self hosted instances of docs/sheets/slides. Users are able to edit documents in real time. Thanks @k3tan172 and @plutocrat | | [Nextcloud](https://www.nextcloud.com/) | | Nextcloud 19 now has Community Document Server and **[ONLYOFFICE](https://www.onlyoffice.com/)** apps integrated which allows self hosted instances of docs/sheets/slides. Users are able to edit documents in real time. Thanks @k3tan172 and @plutocrat |

View File

@ -156,7 +156,7 @@ web based products:
url: https://www.nextcloud.com/ url: https://www.nextcloud.com/
eyes: null eyes: null
text: | text: |
Nextcloud 18 now has Community Document Server and **[ONLYOFFICE](https://www.onlyoffice.com/)** apps integrated which allows self hosted instances of docs/sheets/slides. Users are able to edit documents in real time. Thanks @k3tan172 and @plutocrat Nextcloud 19 now has Community Document Server and **[ONLYOFFICE](https://www.onlyoffice.com/)** apps integrated which allows self hosted instances of docs/sheets/slides. Users are able to edit documents in real time. Thanks @k3tan172 and @plutocrat
blogger and sites: blogger and sites:
- title: Blogger/Sites - title: Blogger/Sites
- name: Joomla - name: Joomla