summary refs log tree commit diff
path: root/VERSION
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-29 16:18:59 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-29 16:18:59 +0000
commit8e571cbed8c1eccea169589362fa977406f594a6 (patch)
tree4723970b6cf46305c1db16145d05acc026fea3e7 /VERSION
parentMerge branch 'client_v2_filter' into client_v2_sync (diff)
parentMerge branch 'develop' into client_v2_filter (diff)
downloadsynapse-8e571cbed8c1eccea169589362fa977406f594a6.tar.xz
Merge branch 'client_v2_filter' into client_v2_sync
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions