182742fbec
Conflicts: .gitignore app/models/task.rb app/models/workgroup.rb app/views/shared/_group_form.html.haml config/locales/de.yml db/schema.rb
15 lines
239 B
Text
15 lines
239 B
Text
log/*.log
|
|
tmp/**/*
|
|
config/*.yml
|
|
db/*.sqlite3
|
|
nbproject/
|
|
config/environments/development.rb
|
|
capfile
|
|
config/environments/fcschinke09.rb
|
|
*.swp
|
|
public/**/*_cached.*
|
|
config/initializers/secret_token.rb
|
|
.idea
|
|
.rvmrc
|
|
.get-dump.yml
|
|
.rbenv-version
|