0dffa9d0e0
Fixes a merge conflict with debian/changelog Signed-off-by: Dan Callahan <danc@element.io> |
||
|---|---|---|
| .. | ||
| po | ||
| source | ||
| test | ||
| .gitignore | ||
| NEWS | ||
| build_virtualenv | ||
| changelog | ||
| compat | ||
| control | ||
| copyright | ||
| dirs | ||
| hash_password.1 | ||
| hash_password.ronn | ||
| install | ||
| manage_debconf.pl | ||
| manpages | ||
| matrix-synapse-py3.config | ||
| matrix-synapse-py3.links | ||
| matrix-synapse-py3.postinst | ||
| matrix-synapse-py3.preinst | ||
| matrix-synapse.default | ||
| matrix-synapse.service | ||
| register_new_matrix_user.1 | ||
| register_new_matrix_user.ronn | ||
| rules | ||
| synapse_port_db.1 | ||
| synapse_port_db.ronn | ||
| synapse_review_recent_signups.1 | ||
| synapse_review_recent_signups.ronn | ||
| synctl.1 | ||
| synctl.ronn | ||
| templates | ||