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

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
Mark Haines 2015-12-07 13:13:43 +00:00
commit d547afeae0
4 changed files with 30 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/storage/test_events.py
View file

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import uuid
from mock.mock import Mock
from mock import Mock
from synapse.types import RoomID, UserID
from tests import unittest