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

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

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

darkswarm

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

2016-03-19 07:16:41 +11:00

shared

Perform shops search by proximity instead of plain string match

2015-07-10 17:45:15 +10:00

store

return basic css and js for oldskool login that somehow still exists

2014-10-02 13:24:59 +10:00

templates

Restore links_dropdown

2016-03-11 16:39:07 +11:00

application.js

new rails 3.1.4 app

2012-03-27 10:10:26 +11:00

iehack.js

Patching up IE warning

2014-06-19 15:18:14 +10:00

jquery-migrate-1.0.0.js

Removing JMigrate warnings

2014-02-27 16:15:06 +11:00