mirror of
https://github.com/danbee/danbarberphoto
synced 2025-03-04 08:49:07 +00:00
08170ec5e0
Conflicts: .gitignore .rvmrc Gemfile Gemfile.lock README Rakefile app/assets/javascripts/application.js app/assets/stylesheets/application.css app/controllers/admin/admin_users_controller.rb app/controllers/application_controller.rb app/models/admin_user.rb config.ru config/application.rb config/config.yml config/database.yml config/environment.rb config/environments/development.rb config/environments/production.rb config/environments/test.rb config/initializers/secret_token.rb config/initializers/session_store.rb config/routes.rb db/schema.rb db/seeds.rb
12 lines
97 B
Plaintext
12 lines
97 B
Plaintext
.bundle
|
|
db/*.sqlite3
|
|
log/*.log
|
|
tmp/**/*
|
|
tmp/*
|
|
public/system
|
|
.*~
|
|
.*.swp
|
|
.DS*
|
|
**/.DS*
|
|
.sass-cache/
|