Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity
foodsoft/app/views/home
History
wvengen 7af796c09c Merge remote-tracking branch 'bennibu/rails3' into rails3 
Conflicts:
	app/controllers/admin/ordergroups_controller.rb
	app/controllers/finance/balancing_controller.rb
	app/controllers/suppliers_controller.rb
	app/views/articles/_article.html.haml
	app/views/finance/balancing/_summary.haml
	app/views/finance/balancing/new.html.haml
	app/views/group_orders/_form.html.haml
	app/views/home/_apple_bar.html.haml
	app/views/suppliers/index.haml
 		2013-03-21 22:08:09 +01:00
..
_apple_bar.html.haml Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-03-21 22:08:09 +01:00
_start_nav.haml finished home i18n 2013-02-04 00:46:22 +01:00
index.html.haml finished home i18n 2013-02-04 00:46:22 +01:00
ordergroup.html.haml finished home i18n 2013-02-04 00:46:22 +01:00
ordergroup.js.haml Removed fancybox. Fixed profile, my ordergroup and tasks. 2012-11-12 09:18:44 +01:00
profile.html.haml finished home i18n 2013-02-04 00:46:22 +01:00