Merge remote-tracking branch 'origin/master' into add-dns-table

This commit is contained in:
nitrohorse
2019-08-06 18:22:43 -07:00
7 changed files with 75 additions and 32 deletions

View File

@ -11,7 +11,7 @@
image="/assets/img/tools/Joplin.png"
url="https://joplinapp.org/"
footer="OS: Windows, macOS, Linux, iOS, Android, Firefox/Chrome (Web Clipper)."
description="Joplin is a free, open source, fully featured note taking and to-do application, which can handle a large number of markdown notes organized into notebooks and tags. It offers E2EE encryption and can sync through Nextcloud, Dropbox and more. It also offers easy import from Evernote and plain text notes."
description="Joplin is a free, open source, fully featured note taking and to-do application, which can handle a large number of markdown notes organized into notebooks and tags. It offers E2E encryption and can sync through Nextcloud, Dropbox and more. It also offers easy import from Evernote and plain text notes."
%}
{% include card.html color="primary"