diaspora/.gitignore
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

32 lines
461 B
Text

# Configuration files
config/app_config.yml
config/fb_config.yml
config/initializers/secret_token.rb
.bundle
vendor/bundle/*
# Generated files
log/*
public/stylesheets/application.css
public/stylesheets/sessions.css
public/stylesheets/ui.css
# Uploded files and local files
public/uploads/*
public/source.tar
tmp/**/*
db/*.sqlite3
# Temporary files of every sort
.DS_Store
.idea
.rvmrc
.stgit*
*.swap
*.swo
*.swp
*~
bin/*
nbproject
patches-*
capybara-*.html