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
..
new.html.haml	Merge branch 'develop' into diaspora_with_sprites	2013-03-11 20:10:55 -03:00
new.mobile.haml	you are now able to invite friends from the mobile site	2011-08-14 15:40:07 -07:00