Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
foodsoft/app/views/invites
History
wvengen f6ba21832d Merge remote-tracking branch 'bennibu/rails3' into rails3 
Conflicts:
	app/controllers/articles_controller.rb
	app/views/articles/_form.html.haml
	app/views/articles/sync.html.haml
	app/views/finance/balancing/_edit_note.html.haml
	app/views/finance/group_order_articles/_form.html.haml
	app/views/finance/order_articles/_edit.html.haml
	app/views/finance/order_articles/_new.html.haml
	app/views/group_orders/show.html.haml
	app/views/invites/_modal_form.html.haml
2013-04-12 15:45:24 +02:00
..
_modal_form.html.haml Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-04-12 15:45:24 +02:00
create.js.haml Removed fancybox. Fixed profile, my ordergroup and tasks. 2012-11-12 09:18:44 +01:00
new.html.haml fix small format bug in template 2013-02-04 13:13:04 +01:00
new.js.haml Removed fancybox. Fixed profile, my ordergroup and tasks. 2012-11-12 09:18:44 +01:00