Merge branch 'stable' into develop
This commit is contained in:
commit
8df9cb9cd2
1 changed files with 3 additions and 3 deletions
|
|
@ -44,9 +44,9 @@ var factory = {
|
|||
"id": id,
|
||||
"diaspora_id": "bob@bob.com",
|
||||
"avatar":{
|
||||
"large":"http://localhost:3000/images/user/uma.jpg",
|
||||
"medium":"http://localhost:3000/images/user/uma.jpg",
|
||||
"small":"http://localhost:3000/images/user/uma.jpg"}
|
||||
"large":"http://localhost:3000/assets/user/uma.jpg",
|
||||
"medium":"http://localhost:3000/assets/user/uma.jpg",
|
||||
"small":"http://localhost:3000/assets/user/uma.jpg"}
|
||||
};
|
||||
|
||||
return _.extend(defaultAttrs, overrides);
|
||||
|
|
|
|||
Loading…
Reference in a new issue