9edbac5ac8
Conflicts: .gitignore
17 lines
196 B
Text
17 lines
196 B
Text
.bundle
|
|
.rbx/
|
|
db/*.sqlite3
|
|
db/*.sqlite3-journal
|
|
log/*.log
|
|
tmp/
|
|
.sass-cache/
|
|
coverage/*
|
|
*.swp
|
|
public/uploads/
|
|
.rvmrc
|
|
.directory
|
|
nohup.out
|
|
Vagrantfile
|
|
.vagrant
|
|
config/gitlab.yml
|
|
config/database.yml
|