nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Jonne Haß 2015-06-05 09:40:39 +02:00
commit 8df9cb9cd2
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
spec/javascripts/helpers/factory.js
View file

@ -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);