nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/views/layouts
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
..
_footer.html.haml dry up and modularize layouts 2013-03-06 19:00:34 +01:00
_header.html.haml Merge branch 'develop' into diaspora_with_sprites 2013-03-11 20:10:55 -03:00
application.html.haml dry up and modularize layouts 2013-03-06 19:00:34 +01:00
application.mobile.haml friendlier mobile buttons 2013-02-09 15:23:04 +01:00
centered_with_header_with_footer.html.haml dry up and modularize layouts 2013-03-06 19:00:34 +01:00
notifier.html.erb query the set url only through #pod_uri in the app 2012-09-26 20:19:37 +02:00
notifier.text.haml use pod name helper in emails 2012-06-04 14:04:39 -07:00
with_header.html.haml dry up and modularize layouts 2013-03-06 19:00:34 +01:00
with_header_with_footer.html.haml dry up and modularize layouts 2013-03-06 19:00:34 +01:00