Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 10:56:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into rav/enforce_report_api

Browse source
This commit is contained in:
Richard van der Hoff 2018-07-12 09:56:28 +01:00
commit 482d17b58b
370 changed files with 5309 additions and 2679 deletions
Download patch file Download diff file Expand all files Collapse all files

11
synapse/rest/client/v2_alpha/report_event.py
View file

@ -13,21 +13,22 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import logging
from six import string_types
from six.moves import http_client
from twisted.internet import defer
from synapse.api.errors import SynapseError, Codes
from synapse.api.errors import Codes, SynapseError
from synapse.http.servlet import (
RestServlet, parse_json_object_from_request,
RestServlet,
assert_params_in_request,
parse_json_object_from_request,
)
from ._base import client_v2_patterns
import logging
logger = logging.getLogger(__name__)