Updated image branding and files with refs to them
Submitted new images with blurred edges
new version of white2x
Merge branch 'hotfix/0.3.0.1'
fix regression caused by updating backbone.js without updating changed parameters
Fix timeago on mobile devices. Fix missing space
embedding youtube videos over https
SPV small improvements
improve reshared posts
Merge pull request #4752 from svbergerem/fix-timeago-mobile

Fix timeago on mobile devices. Fix missing space
bump kaminari
Updating queries for the stream to be faster
updated 31 locale files [ci skip]
Merge branch '4264-embed-youtube-on-https' of https://github.com/arlogn/diaspora into arlogn-4264-embed-youtube-on-https
Merge pull request #4754 from svbergerem/small-improvements-spv

SPV small improvements
Merge pull request #4702 from goobertron/new_logos

Updated image branding (issue #4444)
Merge pull request #4747 from Raven24/fix_aspect_stream

fix regression caused by updating backbone.js in aspect stream
Changing text messages -> conversations
Standardise - code refs to 'messages' to 'conversations'
Merge branch 'goobertron-rename_messages' into develop