summary refs log tree commit diff
path: root/README.rst
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-09-07 15:06:46 +0100
committerMark Haines <mark.haines@matrix.org>2015-09-07 15:06:46 +0100
commit73e4ad4b8b24bb99a8ede4bda8ac2263b68cad5e (patch)
tree268463223a4dbed35244b83ffb7b767330f8416e /README.rst
parentupdate logger to match new ambiguous script name... (diff)
parentDEPENDENCY_LINKS was turned to a list (diff)
downloadsynapse-73e4ad4b8b24bb99a8ede4bda8ac2263b68cad5e.tar.xz
Merge branch 'master' into develop
Conflicts:
	setup.py
Diffstat (limited to 'README.rst')
-rw-r--r--README.rst1
1 files changed, 1 insertions, 0 deletions
diff --git a/README.rst b/README.rst
index d8d179135b..5b30ee3563 100644
--- a/README.rst
+++ b/README.rst
@@ -94,6 +94,7 @@ Synapse is the reference python/twisted Matrix homeserver implementation.
 System requirements:
 - POSIX-compliant system (tested on Linux & OS X)
 - Python 2.7
+- At least 512 MB RAM.
 
 Synapse is written in python but some of the libraries is uses are written in
 C. So before we can install synapse itself we need a working C compiler and the