Merge remote-tracking branch 'origin/develop' into neilj/fix_reap_users_in_postgres
No related branches found
No related tags found
Showing
- .travis.yml 10 additions, 0 deletions.travis.yml
- changelog.d/3423.misc 1 addition, 0 deletionschangelog.d/3423.misc
- changelog.d/3669.misc 1 addition, 0 deletionschangelog.d/3669.misc
- changelog.d/3677.bugfix 1 addition, 0 deletionschangelog.d/3677.bugfix
- changelog.d/3684.misc 1 addition, 0 deletionschangelog.d/3684.misc
- docker/Dockerfile 1 addition, 1 deletiondocker/Dockerfile
- synapse/handlers/presence.py 5 additions, 0 deletionssynapse/handlers/presence.py
- synapse/static/client/register/index.html 1 addition, 1 deletionsynapse/static/client/register/index.html
- synapse/static/client/register/js/recaptcha_ajax.js 0 additions, 195 deletionssynapse/static/client/register/js/recaptcha_ajax.js
- synapse/storage/client_ips.py 5 additions, 0 deletionssynapse/storage/client_ips.py
- tests/__init__.py 3 additions, 0 deletionstests/__init__.py
- tests/api/test_auth.py 1 addition, 1 deletiontests/api/test_auth.py
- tests/api/test_filtering.py 4 additions, 1 deletiontests/api/test_filtering.py
- tests/crypto/test_keyring.py 2 additions, 4 deletionstests/crypto/test_keyring.py
- tests/handlers/test_auth.py 1 addition, 1 deletiontests/handlers/test_auth.py
- tests/handlers/test_device.py 1 addition, 1 deletiontests/handlers/test_device.py
- tests/handlers/test_directory.py 1 addition, 0 deletionstests/handlers/test_directory.py
- tests/handlers/test_e2e_keys.py 1 addition, 1 deletiontests/handlers/test_e2e_keys.py
- tests/handlers/test_profile.py 1 addition, 0 deletionstests/handlers/test_profile.py
- tests/handlers/test_register.py 1 addition, 0 deletionstests/handlers/test_register.py
Loading
Please register or sign in to comment