wvengen b30b424540 Merge branch 'master' into feature-receive ... Conflicts: app/helpers/finance/order_articles_helper.rb		2014-01-09 18:42:29 +01:00
..
factories	add receive screen, quantities for model, redistribution	2013-11-25 14:17:31 +01:00
integration	cleanup and expand receive integration test	2014-01-08 13:07:11 +01:00
lib	adds an RSS feed for pages/all	2014-01-04 20:12:01 +01:00
models	make product redistribution work!	2013-11-27 00:06:25 +01:00
support	update coverage and use coveralls.io	2013-12-16 23:11:39 +01:00
i18n_spec.rb	fix i18n spec after changes	2013-10-17 17:10:33 +02:00
spec_helper.rb	fix last commit for non-js tests	2013-10-30 01:28:59 +01:00