Merge branch 'master' of github.com:diaspora/diaspora

This commit is contained in:
Raphael 2010-12-02 19:42:52 -08:00
commit 7a89c1d3e4

View file

@ -775,7 +775,7 @@ label
:shadow 0 1px 1px #eee :shadow 0 1px 1px #eee
#file-upload #file-upload
:z-index 3 :z-index 10
:float right :float right
:height 34px :height 34px
:width 70px :width 70px
@ -1506,6 +1506,7 @@ ul.aspects
:display inline :display inline
:left 600px :left 600px
:top 0 :top 0
:z-index 10
#profile_photo_upload #profile_photo_upload