diaspora/app/views/users/getting_started
danielvincent 385e1673ab Merge branch 'master' into getting-started
Conflicts:
	app/controllers/users_controller.rb
	app/views/users/_account.haml
	app/views/users/_profile.haml
2010-10-26 16:50:57 -07:00
..
1.html.haml Merge branch 'master' into getting-started 2010-10-26 16:50:57 -07:00
2.html.haml save and continue buttons on getting_started#1 and getting_started#2. raise fields 2010-10-26 15:03:38 -07:00
3.html.haml save and continue buttons on getting_started#1 and getting_started#2. raise fields 2010-10-26 15:03:38 -07:00