nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/views/layouts
History
danielgrippi 60a60733df Merge branch 'master' into follow 
Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/contacts_controller.rb
	app/controllers/people_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/notifications_helper.rb
	app/models/notifications/new_request.rb
	app/models/user_preference.rb
	public/javascripts/view.js
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
	spec/controllers/home_controller_spec.rb
	spec/controllers/post_visibilities_controller_spec.rb
	spec/controllers/requests_controller_spec.rb
	spec/mailers/notifier_spec.rb
	spec/models/user_spec.rb
2011-05-12 15:49:51 -07:00
..
_debug.haml Remove some old views, clean up routes, clean up. 2010-12-01 15:38:56 -08:00
_header.html.haml Working on styling the ContactsController#sharing 2011-05-10 14:17:43 -07:00
application.html.haml png favicon 2011-05-09 16:24:24 -07:00
application.mobile.haml Add message inbox link to mobile menu 2011-05-10 12:08:05 -05:00
notifier.html.haml cleaned up craziness in users and likes routing, fixed #961 2011-03-24 03:02:14 +01:00
notifier.text.haml cleaned up craziness in users and likes routing, fixed #961 2011-03-24 03:02:14 +01:00