Created new branch: Update image branding

[dorman]

I tried through the shell, but had some trouble creating a new branch. I think I have created the right branch called "Update_Image_Branding". Let me know what you think @MrZyx

Will this new branch I created replace the "branding" folder under asstes/images?

Thanks,
D

[jhass]

Well, the issue wasn't so much that you didn't manage to include the updated images or that the branch name was completely unrelated, but that you based the branch on the completely outdated and unmerged branch "capybara-webkit". Which you did again. Lets try again, this time seek for help if you get stuck:

git remote add upstream git://github.com/diaspora/diaspora.git
git fetch upstream
git branch -m update_image_branding update_image_branding_broken
git checkout -b update_image_branding upstream/develop
git cherry-pick f4474b7cc1569475896305008bb6d8bbc6bb9962
# If this yields a conflict examine it with git status. It may list some files saying "both modified".
# Examine the file, if needed replace it with the wanted version and run git add on it. After you've done
# that for all files mentioned as "both modified" and git status doesn't report any of these anymore
# Run git commit without any additional parameters.
git cherry-pick 52e18ebacc2d5fe31a00707978d15908f1ac8acb
# Same as for the previous command applies
# Now start Diaspora and look around, Everything replaced? Does it look good? Grab some screenshots for us ;)
# If needed make any additional changes and regularly git commit them. Then
git push -uf origin update_image_branding
# No need to open a new pull request, this one will update automatically

[jhass]

Due to the git troubles here we decided to go with #4702. Thank you for your work nonetheless!