nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/app/views
History
ilya 08b9aa864a Merge branch 'master' of github.com:diaspora/diaspora into fb 
Conflicts:
	app/views/layouts/application.html.haml
	app/views/shared/_publisher.haml
	app/views/shared/_sub_header.haml
	app/views/users/edit.html.haml
	config/deploy_config.yml
	config/routes.rb
2010-09-27 15:39:50 -07:00
..
albums Use improved whitespace:scrub_gratuitous_newlines 2010-09-26 12:52:39 -04:00
aspects Merge branch 'master' of github.com:diaspora/diaspora into fb 2010-09-27 15:39:50 -07:00
comments Use improved whitespace:scrub_gratuitous_newlines 2010-09-26 12:52:39 -04:00
devise Big clean up: delete trailing whitespace 2010-09-26 12:48:40 -04:00
fb_status passing the right things to the partial 2010-09-24 15:52:29 -07:00
js Use improved whitespace:scrub_gratuitous_newlines 2010-09-26 12:52:39 -04:00
layouts Use improved whitespace:scrub_gratuitous_newlines 2010-09-26 12:52:39 -04:00
people Use improved whitespace:scrub_gratuitous_newlines 2010-09-26 12:52:39 -04:00
photos Use improved whitespace:scrub_gratuitous_newlines 2010-09-26 12:52:39 -04:00
posts Use improved whitespace:scrub_gratuitous_newlines 2010-09-26 12:52:39 -04:00
publics Big clean up: delete trailing whitespace 2010-09-26 12:48:40 -04:00
registrations Use improved whitespace:scrub_gratuitous_newlines 2010-09-26 12:52:39 -04:00
requests Use improved whitespace:scrub_gratuitous_newlines 2010-09-26 12:52:39 -04:00
shared Merge branch 'master' of github.com:diaspora/diaspora into fb 2010-09-27 15:39:50 -07:00
status_messages Use improved whitespace:scrub_gratuitous_newlines 2010-09-26 12:52:39 -04:00
users Merge branch 'master' of github.com:diaspora/diaspora into fb 2010-09-27 15:39:50 -07:00