aboutsummaryrefslogtreecommitdiffstats
path: root/config/memcached.yml-test
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2012-10-17 15:05:37 +0100
committerLouise Crow <louise.crow@gmail.com>2012-10-17 15:05:37 +0100
commitc8a203e221a55a5653596f5a8e092bd3877df9c4 (patch)
tree3de4ac1214eca2c12a357e5f338b0d3055e79721 /config/memcached.yml-test
parente6dc0f6606b26e13cb0cd16124fdb2aad3c1b5a6 (diff)
parentcc7bc36d5748c9baa0cfd8e44395923cc5792f32 (diff)
Merge branch 'release/0.6.7'
Conflicts: locale/cs/app.po locale/ro_RO/app.po
Diffstat (limited to 'config/memcached.yml-test')
-rw-r--r--config/memcached.yml-test2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/memcached.yml-test b/config/memcached.yml-test
new file mode 100644
index 000000000..18d959876
--- /dev/null
+++ b/config/memcached.yml-test
@@ -0,0 +1,2 @@
+test:
+ disabled: true \ No newline at end of file