diff options
| author | Neil Johnson <neil@fragile.org.uk> | 2018-03-20 14:25:31 +0000 |
|---|---|---|
| committer | Neil Johnson <neil@fragile.org.uk> | 2018-03-20 14:25:31 +0000 |
| commit | e66fbcbb02d98a0d165f3c5d4642d26add233562 (patch) | |
| tree | 01b5c79c3951f31d5826a852f49aa312d8e47604 /res | |
| parent | Update __init__.py (diff) | |
| parent | Merge pull request #3005 from matrix-org/erikj/fix_cache_size (diff) | |
| download | synapse-e66fbcbb02d98a0d165f3c5d4642d26add233562.tar.xz | |
fix merge conflicts
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions