wvengen 2b511ee559 Merge branch 'master' into fresh-flow ... Conflicts: app/assets/stylesheets/bootstrap_and_overrides.css.less		2013-12-18 17:03:26 +01:00
..
factories	add receive screen, quantities for model, redistribution	2013-11-25 14:17:31 +01:00
integration	Merge branch 'master' into allow-no-nickname	2013-10-29 19:15:52 +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