summary refs log tree commit diff
path: root/.gitignore
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-02 17:46:33 +0000
committerErik Johnston <erik@matrix.org>2014-12-02 17:46:33 +0000
commit3aa333ec7cc627adbbac013b9a7425a8a79cdf0d (patch)
tree73d43fe0c888c54c54981037848b63dd89b07ba3 /.gitignore
parentMerge branch 'master' into develop (diff)
parentBump version (diff)
downloadsynapse-3aa333ec7cc627adbbac013b9a7425a8a79cdf0d.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions