Juan Manuel Azambuja 1115e10536 Merge branch 'develop' into diaspora_with_sprites ... Conflicts: Gemfile Gemfile.lock app/assets/stylesheets/application.css.sass app/assets/templates/comment_tpl.jst.hbs app/assets/templates/stream-element_tpl.jst.hbs app/helpers/aspects_helper.rb app/helpers/contacts_helper.rb app/views/aspects/_aspect_listings.haml app/views/aspects/toggle_contact_visibility.js.erb app/views/contacts/_aspect_listings.haml app/views/layouts/_header.html.haml app/views/shared/_footer.html.haml app/views/tags/_followed_tags_listings.haml		2013-03-11 20:10:55 -03:00
..
arrow_down.png
arrow_down_small.png
arrow_up_small.png
back_white.png
bookmark.png
camera.png
check_yes_ok.png
check_yes_ok_lighter.png
check_yes_ok_white.png
coffee.png
cog.png
comment_mobile_grey.png
compose_mobile.png
compose_mobile2.png
cubbies.png
deletelabel.png	[Sprites] add sprites for icon images	2013-03-11 19:26:11 -03:00
globe.png
heart.png
heart_mobile_grey.png
heart_mobile_red.png
home_grey.png
ignoreuser.png	Resize deletelabel and ignoreuser images to align them	2012-12-02 13:20:24 +01:00
list_white.png
mail.png	Add feature contact pod admin	2012-12-06 15:26:49 +01:00
mail_big.png
mail_grey.png
monotone_add_plus.png
monotone_check_yes.png
monotone_close_exit_delete.png
monotone_email_letter_round.png
monotone_pen_write.png
monotone_plus_add_round.png
monotone_question.png
monotone_wrench_settings.png
my_activity.png	Add My Activity icon mobile	2012-10-26 22:47:43 +02:00
notifications_grey.png
padlock-closed.png	[Sprites] add sprites for icon images	2013-03-11 19:26:11 -03:00
padlock-open.png	[Sprites] add sprites for icon images	2013-03-11 19:26:11 -03:00
pen_write.png
pencil.png
pencil_mobile_grey.png
pencil_mobile_grey_active.png
pencil_mobile_grey_mobile.png
photo.png
plus.png
question.png
reshare_mobile.png
reshare_mobile_active.png
search_grey.png
search_white.png
smiley_laughing.png
user_grey.png