Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/reputage/didery into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
ntelfer committed Oct 17, 2018
2 parents fdf5858 + 9d7c64a commit 8e177cc
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/didery/static/transcrypt/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,8 @@ def _parseAll(self, data):
"""
if 'data' in data:
for key, history in data['data'].items():
self.history.append(JSON.parse(history))
for key, history in enumerate(data['data']):
self.history.append(history)

# ================================================== #

Expand Down Expand Up @@ -289,7 +289,7 @@ def _parseAll(self, data):

if 'data' in data:
for blob in data['data']:
self.blobs.append(JSON.parse(blob))
self.blobs.append(blob)

# ================================================== #

Expand Down Expand Up @@ -359,4 +359,4 @@ def _parseAll(self, data):

# ================================================== #
# EOF #
# ================================================== #
# ================================================== #

0 comments on commit 8e177cc

Please sign in to comment.