diff --git a/README.md b/README.md index ebcf4252f1..69ff732129 100644 --- a/README.md +++ b/README.md @@ -20,9 +20,9 @@ Three types of applications are available: for the **desktop** (Windows, macOS a Operating System | Download | Alternative -----------------|--------|------------------- -Windows (32 and 64-bit) | Get it on Windows | Or get the Portable version

The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file. -macOS | Get it on macOS | You can also use Homebrew: `brew cask install joplin` -Linux | Get it on Linux | An Arch Linux package [is also available](#terminal-application).

If it works with your distribution (it has been tested on Ubuntu, Fedora, Gnome and Mint), the recommended way is to use this script as it will handle the desktop icon too:

`wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_install_and_update.sh | bash` +Windows (32 and 64-bit) | Get it on Windows | Or get the Portable version

The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file. +macOS | Get it on macOS | You can also use Homebrew: `brew cask install joplin` +Linux | Get it on Linux | An Arch Linux package [is also available](#terminal-application).

If it works with your distribution (it has been tested on Ubuntu, Fedora, Gnome and Mint), the recommended way is to use this script as it will handle the desktop icon too:

`wget -O - https://raw.githubusercontent.com/laurent22/joplin/master/Joplin_install_and_update.sh | bash` ## Mobile applications diff --git a/docs/api/index.html b/docs/api/index.html index 45c9d3ad83..d3dec250b4 100644 --- a/docs/api/index.html +++ b/docs/api/index.html @@ -261,7 +261,8 @@
  • About

    diff --git a/docs/changelog/index.html b/docs/changelog/index.html index f0af289c0f..e66e15fec1 100644 --- a/docs/changelog/index.html +++ b/docs/changelog/index.html @@ -1,7 +1,7 @@ - Changelog | Joplin + Changelog (Desktop App) | Joplin @@ -261,7 +261,8 @@
  • About

    @@ -269,6 +270,18 @@

    🔗Joplin changelog

    +

    🔗v1.0.152 - 2019-05-13T09:08:07Z

    +

    Same as v1.0.151 but with a fix to the migration issue, that was in turns affecting synchronisation.

    +

    🔗v1.0.151 - 2019-05-12T15:14:32Z

    Same as v1.0.150 but with a small fix to set the resources file size.