wvengen 60826ceedc allow to edit GroupOrderArticle result from orders screen ... Conflicts: app/assets/javascripts/application.js		2014-02-10 16:03:08 +01:00
..
factories	add receive screen, quantities for model, redistribution	2013-11-25 14:17:31 +01:00
integration	allow to edit GroupOrderArticle result from orders screen	2014-02-10 16:03:08 +01:00
lib	adds an RSS feed for pages/all	2014-01-04 20:12:01 +01:00
models	allow non-shared articles to be part of a shared supplier using a blank order number	2014-01-24 22:10:00 +01:00
support	fix "Mysql2::Error: This connection is in use by" in spec for Rails 4	2014-02-10 15:58:52 +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