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
..
assets	Merge branch 'develop' into diaspora_with_sprites	2013-03-11 20:10:55 -03:00
controllers	* Add test for mobile page: Edit profile mobile, Conversations mobile, Getting Started mobile	2013-03-10 15:02:18 +01:00
helpers	Merge branch 'develop' into diaspora_with_sprites	2013-03-11 20:10:55 -03:00
mailers	New configuration system	2012-09-26 20:19:37 +02:00
models	If post has photos, always include url in post to Facebook to stay consistant with other servies, fixes #3706	2013-03-10 08:15:12 +02:00
presenters	bootstrap my_aspects data	2013-01-16 19:33:20 -02:00
uploaders	resize full scaled image to a specific width #3793	2013-01-26 11:36:01 +01:00
views	Merge branch 'develop' into diaspora_with_sprites	2013-03-11 20:10:55 -03:00