Julius Rapp 11117738ce Resolve merge conflicts		2013-12-07 11:50:37 +01:00
..
assets	fix modal dialog margin [ci skip]	2013-12-06 14:26:04 +01:00
controllers	AJAX_ify StockArticle manipulation; Introduce publish/subscribe pattern for DOM updates	2013-12-07 11:20:44 +01:00
documents	i18n simple_form move of fax pdf	2013-10-09 23:41:15 +02:00
helpers	Resolve merge conflicts	2013-12-07 11:50:37 +01:00
inputs	Improved tasks.	2012-10-08 21:52:03 +02:00
mailers	user display changes in model and mailer	2013-09-22 14:38:56 +02:00
models	i18n cleanup (affects foodcoops#137)	2013-12-06 22:43:36 +01:00
views	Resolve merge conflicts	2013-12-07 11:50:37 +01:00
workers	Merge remote-tracking branch 'fsmanuel/master' into master.	2013-07-18 18:48:49 +02:00