openfoodnetwork

mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-05 22:26:07 +00:00

Files

Maikel Linke 8107f49373 Merge remote-tracking branch 'origin/master' into transifex

Conflicts:
	config/locales/fr.yml

2017-03-16 09:30:22 +11:00

en_GB.yml

2016-11-30 01:07:53 +11:00

en-GB.yml

2017-02-22 13:40:17 +11:00

en-US.yml

2017-02-19 22:08:34 +01:00

en.yml

2017-03-15 16:39:04 +11:00

es.yml

2015-12-24 11:44:12 +11:00

fr.yml

2017-03-16 09:30:22 +11:00

it.yml

2017-02-19 22:08:34 +01:00

nb.yml

2017-02-19 22:08:34 +01:00

pt-BR.yml

2017-02-19 22:08:34 +01:00

simple_form.en.yml

2012-06-19 10:29:26 +10:00

sv.yml

2017-02-19 22:08:34 +01:00