wvengen 98e7189d31 Merge branch 'master' into i18n ... Conflicts: app/assets/javascripts/application.js		2013-10-18 12:30:34 +02:00
..
_form.haml	fix haml indentation errors	2013-10-17 16:35:50 +02:00
edit.haml	finish suppliers i18n	2013-02-08 00:11:58 +01:00
index.haml	i18n simple_form move of suppliers	2013-10-09 23:12:26 +02:00
new.haml	finish suppliers i18n	2013-02-08 00:11:58 +01:00
shared_suppliers.haml	i18n simple_form move of suppliers	2013-10-09 23:12:26 +02:00
show.haml	Merge branch 'master' into i18n	2013-10-18 12:30:34 +02:00