Merge branch 'rav/docstrings' into rav/return_state_dict

matrix-org · Nov 12, 2015 · 405d26d · 405d26d
2 parents a7da3fd + 6f50513
commit 405d26d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py
@@ -242,7 +242,7 @@ def encode_archived(self, rooms, filter, time_now, token_id):
     @staticmethod
     def encode_room(room, filter, time_now, token_id, joined=True):
         """
-        :param JoinedSyncResult|ArchivedSyncResult room: sync result for a 
+        :param JoinedSyncResult|ArchivedSyncResult room: sync result for a
             single room
         :param FilterCollection filter: filters to apply to the results
         :param int time_now: current time - used as a baseline for age