diaspora/config
Alec Leamas 1481056af2 Revert "Merge remote branch 'upstream/master'"
This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb
2010-10-20 14:59:55 +02:00
..
environments trying the mailer_condig 2010-10-07 16:54:38 -07:00
initializers Merge branch 'invites' of github.com:diaspora/diaspora into invites 2010-10-11 11:52:57 -07:00
locales fixed no friends/posts message positioning 2010-10-19 12:28:54 -07:00
sprinkle Add or later to license notice 2010-10-07 16:25:34 -07:00
app_config.yml.example Firts try, nothing tested 2010-10-19 20:04:23 +02:00
application.rb Add or later to license notice 2010-10-07 16:25:34 -07:00
boot.rb Add or later to license notice 2010-10-07 16:25:34 -07:00
cucumber.yml Add cucumber and run the generator 2010-09-26 11:35:50 -04:00
deploy.rb Add or later to license notice 2010-10-07 16:25:34 -07:00
deploy_config.yml Add or later to license notice 2010-10-07 16:25:34 -07:00
environment.rb Add or later to license notice 2010-10-07 16:25:34 -07:00
fb_config.yml made a public view, copied the fb publisher there 2010-09-23 12:18:26 -07:00
fb_config.yml.example added fb_config to gitignore 2010-10-05 12:21:33 -07:00
routes.rb Revert "Merge remote branch 'upstream/master'" 2010-10-20 14:59:55 +02:00
selenium.yml Add or later to license notice 2010-10-07 16:25:34 -07:00
server.sh Add a configuration file 2010-10-19 08:26:43 +02:00
thin.yml Add or later to license notice 2010-10-07 16:25:34 -07:00