From: Shel R <Yiskah.Raphen@gmail.com>
Date: Sat, 8 Apr 2017 02:59:07 +0000 (-0400)
Subject: Merge branch 'master' into patch-1
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=741bbba6ff79069d79f98879007f453c85ec9c57;p=mastodon.git

Merge branch 'master' into patch-1
---

741bbba6ff79069d79f98879007f453c85ec9c57
diff --cc docs/Running-Mastodon/Production-guide.md
index f195bb982,af21af546..785826aca
--- a/docs/Running-Mastodon/Production-guide.md
+++ b/docs/Running-Mastodon/Production-guide.md
@@@ -90,7 -90,7 +90,9 @@@ It is recommended to create a special u
  
      sudo apt-get install imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev nodejs file git curl
      curl -sL https://deb.nodesource.com/setup_4.x | sudo bash -
 -    apt-get install nodejs
++
 +    sudo apt-get install nodejs
++
      sudo npm install -g yarn
  
  ## Redis