nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/views/contacts
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
..
_aspect_listings.haml Merge branch 'develop' into diaspora_with_sprites 2013-03-11 20:10:55 -03:00
_contact.html.haml Refactor contacts/index 2013-01-29 10:01:08 -02:00
index.html.haml Refactor contacts/index 2013-01-29 10:01:08 -02:00
index.mobile.haml Move Javascript to the asset pipeline 2012-03-27 18:07:44 -07:00
sharing.haml some refactoring regarding the law of demeter 2012-09-23 19:33:19 +02:00
spotlight.haml Allow translation of "suggest member" of Community Spotlight 2012-12-06 13:15:34 +01:00