nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/views/people
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
..
_person.html.haml Merge branch 'master' into HEAD 2010-09-22 21:32:03 -07:00
index.html.haml description text for all boxes in manage page. search box text defaults to query on people#index. 2010-09-18 17:56:26 -07:00
new.html.haml Added people views translations 2010-09-17 11:27:08 -04:00
show.html.haml Merge branch 'master' into HEAD 2010-09-22 21:32:03 -07:00