Enable nginx by default, and override the favicon to find the right tab easier
Compare changes
Files
5
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 9
− 8
@@ -38,7 +38,7 @@ Please read [the prerequisites for all platforms](#prerequisites-for-all-platfor
@@ -49,6 +49,7 @@ We are using PostgreSQL-9.5 in the following example. If you want to use another
@@ -65,7 +66,7 @@ sudo apt-get install software-properties-common python-software-properties
@@ -74,7 +75,7 @@ npm install phantomjs-prebuilt@2.1.12 -g
@@ -83,7 +84,7 @@ npm install phantomjs-prebuilt@2.1.12 -g
@@ -108,7 +109,7 @@ You may need to install Redis 2.8 or newer manually.
@@ -125,7 +126,7 @@ This is tested on CentOS 6.5:
@@ -156,7 +157,7 @@ sudo zypper dup
@@ -189,7 +190,7 @@ Please read [the prerequisites for all platforms](#prerequisites-for-all-platfor