Christophe Vilayphiou
a1e74987dc
Conflicts: Gemfile.lock app/assets/javascripts/.DS_Store app/assets/stylesheets/style.css.erb app/views/layouts/_orbit_bar.html.erb
19 lines
182 B
Plaintext
19 lines
182 B
Plaintext
!.gitignore
|
|
.bundle
|
|
db/*.sqlite3
|
|
log/*.log
|
|
tmp/**/*
|
|
public/uploads/**/*
|
|
uploads/**/*
|
|
|
|
.DS_Store
|
|
|
|
*.swp
|
|
|
|
public/assets
|
|
config/application.rb
|
|
|
|
.rvmrc
|
|
|
|
app/assets/javascripts/.DS_Store
|