Merge branch 'master' into user_groups

v1.18.x
Julian Lam 12 years ago
commit 5fdaa6b0ee

@ -20,7 +20,7 @@ NodeBB requires the following software to be installed:
* A version of Node.js at least 0.8 or greater
* Redis, version 2.6 or greater.
* nginx, version 1.3.13 or greater
* nginx, version 1.3.13 or greater (**only if** intending to use nginx to proxy requests to a NodeBB)
## Installation

Loading…
Cancel
Save