Benjamin Meichsner 71e02ab569 Merge branch 'rails3' into rails3-to-master ... Conflicts: app/views/suppliers/shared_suppliers.haml		2013-09-02 13:31:40 +02:00
..
_form.haml	move commonly used verbs to common i18n identifier	2013-04-04 02:49:52 +02:00
edit.haml	finish suppliers i18n	2013-02-08 00:11:58 +01:00
index.haml	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-03-21 22:08:09 +01:00
new.haml	finish suppliers i18n	2013-02-08 00:11:58 +01:00
shared_suppliers.haml	Merge branch 'rails3' into rails3-to-master	2013-09-02 13:31:40 +02:00
show.haml	finish suppliers i18n	2013-02-08 00:11:58 +01:00