summary refs log tree commit diff
path: root/synapse/secrets.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-07-19 17:31:59 +0100
committerGitHub <noreply@github.com>2018-07-19 17:31:59 +0100
commit7044af32989126001c5989ad05e29fc57bea79f0 (patch)
treeb3736d89568ba766cf0f42de2c8d000022b170fb /synapse/secrets.py
parentMerge branch 'master' into develop (diff)
parentMerge remote-tracking branch 'origin/develop' into hawkowl/markdown (diff)
downloadsynapse-7044af32989126001c5989ad05e29fc57bea79f0.tar.xz
Merge pull request #3564 from matrix-org/hawkowl/markdown
Switch changes to markdown & flip content on for miscs
Diffstat (limited to 'synapse/secrets.py')
0 files changed, 0 insertions, 0 deletions