Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity
foodsoft/db
History
benni 0edd29dfd4 Merge branch 'master' into master-to-rails3 
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
 		2012-12-14 18:10:46 +01:00
..
migrate Merge branch 'master' into master-to-rails3 2012-12-14 18:10:46 +01:00
schema.rb Merge branch 'master' into master-to-rails3 2012-12-14 18:10:46 +01:00
seeds.rb Added seeds.rb for an easy start. 2011-05-06 20:23:33 +02:00