nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/views/aspects
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 [Sprites] add sprites for icon images 2013-03-11 19:26:11 -03:00
_aspect_stream.haml Stream form on profile page 2013-01-31 00:15:27 -03:00
_no_contacts_message.haml featured users => community spotlight 2011-10-20 11:50:58 -07:00
_no_posts_message.haml MS DG update copyright 2011-09-14 11:23:12 -07:00
create.js.erb [WIP] aspect membership dropdown Backbone.js rework 2013-02-17 13:40:10 +01:00
edit.html.haml [Sprites] add sprites for icon images 2013-03-11 19:26:11 -03:00
new.haml MS DG update copyright 2011-09-14 11:23:12 -07:00
toggle_contact_visibility.js.erb Merge branch 'develop' into diaspora_with_sprites 2013-03-11 20:10:55 -03:00