Merge branch 'master' into mistletoe
This commit is contained in:
commit
a0ce359bcc
84 changed files with 21 additions and 25 deletions
|
@ -481,7 +481,7 @@ class User(Base):
|
|||
def json(self):
|
||||
data = self.json_core
|
||||
|
||||
data["badges"] = [x.json_core for x in self.badges]
|
||||
data["badges"] = [x.json for x in self.badges]
|
||||
data['coins'] = self.coins
|
||||
data['post_count'] = self.post_count
|
||||
data['comment_count'] = self.comment_count
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue