5 Commits (3c8c5eabc20efd7734cbebe1eaa6ee2aca5c5030)

Author	SHA1	Message	Date
Richard van der Hoff	f04e35c170	Merge branch 'develop' into matrix-org-hotfixes	2018-07-10 18:04:03 +01:00
Amber Brown	49af402019	run isort	2018-07-09 16:09:20 +10:00
Erik Johnston	7a1406d144	Prefill client_ip_last_seen in replication	2018-06-22 15:58:15 +01:00
Erik Johnston	8c23221666	Fix up	2017-06-27 15:53:45 +01:00
Erik Johnston	78cefd78d6	Make workers report to master for user ip updates	2017-06-27 14:58:10 +01:00