github/diaspora
1
1
Fork 0
mirror of https://github.com/diaspora/diaspora.git synced 2026-04-29 03:01:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable' into develop

Browse Source
This commit is contained in:
Jonne Haß
2015-06-05 09:40:39 +02:00
parent fd3da0f0b3 214ce1cf6e
commit 8df9cb9cd2
1 changed files with 3 additions and 3 deletions
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,
"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);