Commit 8df9cb9c authored by Jonne Haß's avatar Jonne Haß

Merge branch 'stable' into develop

parents fd3da0f0 214ce1cf
...@@ -44,9 +44,9 @@ var factory = { ...@@ -44,9 +44,9 @@ var factory = {
"id": id, "id": id,
"diaspora_id": "bob@bob.com", "diaspora_id": "bob@bob.com",
"avatar":{ "avatar":{
"large":"http://localhost:3000/images/user/uma.jpg", "large":"http://localhost:3000/assets/user/uma.jpg",
"medium":"http://localhost:3000/images/user/uma.jpg", "medium":"http://localhost:3000/assets/user/uma.jpg",
"small":"http://localhost:3000/images/user/uma.jpg"} "small":"http://localhost:3000/assets/user/uma.jpg"}
}; };
return _.extend(defaultAttrs, overrides); return _.extend(defaultAttrs, overrides);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment