nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/views/users
History
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
..
edit.html.haml Remove duplicate sentence from delete account confirmation pop up 2013-03-09 14:15:11 +01:00
edit.mobile.haml Remove duplicate sentence from delete account confirmation pop up 2013-03-09 14:15:11 +01:00
getting_started.haml Merge branch 'develop' into diaspora_with_sprites 2013-03-11 20:10:55 -03:00
getting_started.mobile.haml * Add test for mobile page: Edit profile mobile, Conversations mobile, Getting Started mobile 2013-03-10 15:02:18 +01:00
privacy_settings.html.haml some refactoring regarding the law of demeter 2012-09-23 19:33:19 +02:00
public.atom.builder Include reshares in the public user feed, closes #1781 2013-02-21 14:32:28 +01:00