1af945de11
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
60 lines
898 B
Text
60 lines
898 B
Text
#trademark sillyness
|
|
app/views/home/_show.html.haml
|
|
app/views/home/_show.mobile.haml
|
|
public/images/ball_small.png
|
|
public/images/ball.png
|
|
# Configuration files
|
|
config/app_config.yml
|
|
config/app.yml
|
|
config/application.yml
|
|
config/script_server_config.yml
|
|
config/fb_config.yml
|
|
config/oauth_keys.yml
|
|
config/initializers/secret_token.rb
|
|
config/redis.conf
|
|
config/deploy_config.yml
|
|
config/newrelic.yml
|
|
.bundle
|
|
vendor/bundle/*
|
|
config/database.yml
|
|
.rvmrc_custom
|
|
|
|
# Generated files
|
|
log/*
|
|
public/stylesheets/*.css
|
|
public/diaspora
|
|
spec/fixtures/*.y*ml
|
|
spec/fixtures/*.fixture.*
|
|
coverage/*
|
|
|
|
#Documentation
|
|
.yardoc/
|
|
doc/
|
|
|
|
# Uploaded files and local files
|
|
public/uploads/*
|
|
public/assets/*
|
|
public/source.tar*
|
|
tmp/**/*
|
|
tmp/*
|
|
*.sqlite3
|
|
|
|
# Temporary files of every sort
|
|
.sass-cache/*
|
|
.DS_Store
|
|
.idea
|
|
.redcar
|
|
.rvmrc
|
|
.stgit*
|
|
*.swap
|
|
*.swo
|
|
*.swp
|
|
*~
|
|
bin/*
|
|
nbproject
|
|
patches-*
|
|
capybara-*.html
|
|
dump.rdb
|
|
|
|
#Rubinius's JIT
|
|
*.rbc
|