wvengen 8db516c5f0 Merge branch 'master' into feature-cleaner_order_details ... Conflicts: app/assets/stylesheets/bootstrap_and_overrides.css.less		2014-01-20 13:36:46 +01:00
..
images	add package images [ci skip]	2013-11-25 15:25:13 +01:00
javascripts	Merge remote-tracking branch 'foodcoops/master' into feature-receive	2014-01-02 18:57:59 +01:00
stylesheets	Merge branch 'master' into feature-cleaner_order_details	2014-01-20 13:36:46 +01:00