Maikel Linke 17f168ed06 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into uk/account-balances ...

Applied code conventions.

Conflicts:
	config/locales/en.yml

2016-03-30 13:30:44 +11:00

..

admin

Auto-merged master into i18n-hackathon on deployment.

2016-03-23 10:09:36 +11:00

consumer

Auto-merged master into uk/account-balances on deployment.

2016-03-12 09:11:42 +11:00