headerlogo
headerlogo css
add updating
start side
header footer static
donationside
Merge remote-tracking branch 'upstream/master'
branchomate
code
robot
spbo
donate stuff
donata
donata
donata
Merge branch 'ruhrspora' of github.com:ruhrspora/diaspora into ruhrspora

Conflicts:
	config/locales/diaspora/en.yml
doof
Merge branch 'master' into ruhrspora
..
...1