0edd29dfd4
Conflicts: Gemfile README_DEVEL app/controllers/articles_controller.rb app/controllers/orders_controller.rb app/controllers/tasks_controller.rb app/models/task.rb app/views/articles/_import_search_results.haml app/views/articles/index.haml app/views/messages/new.haml app/views/ordering/_order_head.haml app/views/ordering/my_order_result.haml app/views/orders/show.haml app/views/stockit/new.html.haml db/schema.rb
14 lines
171 B
Text
14 lines
171 B
Text
log/*.log
|
|
tmp/**/*
|
|
config/*.yml
|
|
db/*.sqlite3
|
|
nbproject/
|
|
config/environments/development.rb
|
|
capfile
|
|
*.swp
|
|
*~
|
|
public/**/*_cached.*
|
|
.idea
|
|
.get-dump.yml
|
|
.sass-cache/
|
|
doc/app/
|