summary refs log tree commit diff
path: root/setup.cfg
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-30 14:08:28 +0000
committerErik Johnston <erik@matrix.org>2015-01-30 14:08:28 +0000
commite0b7c521cbe4d9aa4403a8e5394177a51c6d5d8f (patch)
treef84a3b1845ff2e6df699d69f3fbb99a2c1ed918b /setup.cfg
parentMerge branch 'new_state_resolution' of github.com:matrix-org/synapse into rej... (diff)
parentWe do need Twisted 14, not 15: we use internal Twisted things that have been ... (diff)
downloadsynapse-e0b7c521cbe4d9aa4403a8e5394177a51c6d5d8f.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage
Conflicts:
	synapse/storage/__init__.py
	synapse/storage/schema/delta/v12.sql
Diffstat (limited to 'setup.cfg')
-rw-r--r--setup.cfg8
1 files changed, 8 insertions, 0 deletions
diff --git a/setup.cfg b/setup.cfg
index 2830831f00..888ad6ed4a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,3 +8,11 @@ test = trial
 
 [trial]
 test_suite = tests
+
+[check-manifest]
+ignore =
+    contrib
+    contrib/*
+    docs/*
+    pylint.cfg
+    tox.ini