nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/views/shared
History
Raphael 2489f8503f Merge branch 'master' into HEAD 
Conflicts:
	app/controllers/albums_controller.rb
	app/controllers/aspects_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/registrations_controller.rb
	app/controllers/requests_controller.rb
	app/helpers/dashboards_helper.rb
	app/views/albums/show.html.haml
	app/views/aspects/manage.html.haml
	app/views/shared/_aspect_nav.haml
	app/views/shared/_sub_header.haml
	app/views/status_messages/_status_message.html.haml
	app/views/status_messages/show.html.haml
	config/locales/de.yml
	config/locales/en.yml
	config/locales/es.yml
	config/locales/fr.yml
2010-09-22 21:32:03 -07:00
..
_aspect_friends.haml Added localizations that I had missed 2010-09-16 15:55:54 -04:00
_aspect_nav.haml Merge branch 'master' into HEAD 2010-09-22 21:32:03 -07:00
_post_wrapper.haml Spell our own name right 2010-09-15 17:56:18 -07:00
_publisher.haml Merge branch 'master' into HEAD 2010-09-22 21:32:03 -07:00
_reshare.haml DG IZ; reshare redirects to specific page 2010-09-22 15:32:11 -07:00
_sub_header.haml DG IZ; click to edit rollover text on aspect manage page 2010-09-20 15:53:56 -07:00
log.haml Spell our own name right 2010-09-15 17:56:18 -07:00