nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/views/users
History
Raphael Sofaer 1af945de11 Merge branch 'master' into oauth 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/app_config.rb
	app/models/post.rb
	db/schema.rb
	public/stylesheets/sass/application.sass
	spec/lib/webfinger_spec.rb
2011-06-28 17:13:38 -07:00
..
getting_started fixed the getting started step 3, ignore the CA certs in developement is now in initializer, changed the 'login' -> 'connect' [to facebook] png 2011-06-09 15:12:35 -07:00
edit.html.haml nicer auth prompt. wip. 2011-06-23 12:40:47 -07:00
getting_started.html.haml Revert "refactored local person person friend finder functionality to use the partial" 2011-02-08 16:40:33 -08:00