Jonne Haß bef05c14d7 Merge branch '3681-infinite-scroll-on-contact-page' of git://github.com/asphxia/diaspora into develop ... Conflicts: Changelog.md		2013-04-10 18:24:47 +02:00
..
contacts-index.js
featured-users-index.js
invitations-edit.js
invitations-new.js
notifications-index.js
services-finder.js
users-getting-started.js