diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-10-17 14:04:58 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-10-17 14:04:58 +0100 |
| commit | a4927fc05a710cee6217d8a40ce925d5f894fd8f (patch) | |
| tree | 83909e1d903afbf49d50182af79a679442632975 /config/memcached.yml-test | |
| parent | cc27fe66a13fe1504711c64ce5530a1c178e907d (diff) | |
| parent | cc7bc36d5748c9baa0cfd8e44395923cc5792f32 (diff) | |
Merge branch 'release/0.6.7' into wdtk
Conflicts:
config/general.yml-example
Diffstat (limited to 'config/memcached.yml-test')
| -rw-r--r-- | config/memcached.yml-test | 2 |
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 |