summary refs log tree commit diff
path: root/setup.cfg
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-04-21 16:24:38 +0100
committerMark Haines <mjark@negativecurvature.net>2016-04-21 16:24:38 +0100
commit0d5622b08866f05b65fef2fe437722326f07cfb8 (patch)
tree8bdf36f8437f91dc675d0588efc6aa5451465917 /setup.cfg
parentMerge branch 'develop' into markjh/split_pusher (diff)
parentMerge branch 'develop' into markjh/slave_event_push_actions (diff)
downloadsynapse-0d5622b08866f05b65fef2fe437722326f07cfb8.tar.xz
Merge branch 'markjh/slave_event_push_actions' into markjh/split_pusher
Diffstat (limited to 'setup.cfg')
0 files changed, 0 insertions, 0 deletions