summary refs log tree commit diff
path: root/res
diff options
context:
space:
mode:
authorNeil Johnson <neil@fragile.org.uk>2018-04-24 15:52:43 +0100
committerNeil Johnson <neil@fragile.org.uk>2018-04-24 15:52:43 +0100
commit1bb83d5d41e5e3e90ec14a6a9d1f385c452885de (patch)
treeb409baa4722f9cccae3063e9e59361b5e018024a /res
parentRevert "Bump version and update changelog" (diff)
parentBump version and update changelog (diff)
downloadsynapse-1bb83d5d41e5e3e90ec14a6a9d1f385c452885de.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions