summary refs log tree commit diff
path: root/scripts-dev/copyrighter-sql.pl
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2018-10-22 20:27:25 +0200
committerMatthew Hodgson <matthew@matrix.org>2018-10-22 20:27:25 +0200
commit9498cd3e7b6166b1f3a61f828c79036def7a4aae (patch)
tree784b1b17bbcdeb498f1cb51114dd2d0b6b3bebd2 /scripts-dev/copyrighter-sql.pl
parentmerge in master (diff)
downloadsynapse-9498cd3e7b6166b1f3a61f828c79036def7a4aae.tar.xz
fix conflict and reinstate 6372dff771413c2b9cd5648cbb6de01a679ef801
Diffstat (limited to 'scripts-dev/copyrighter-sql.pl')
0 files changed, 0 insertions, 0 deletions