Maikel Linke 51064f31a3 Merge remote-tracking branch 'origin/master' into uk-variable-weights-improvements

2015-09-10 16:05:28 +10:00

..

admin

Auto-merge from CI [skip ci]

2015-09-02 14:44:05 +10:00

darkswarm

Restoring all changes of the last combined branch

2015-09-10 15:03:13 +10: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

Restoring all changes of the last combined branch

2015-09-10 15:03:13 +10:00

application.js

new rails 3.1.4 app

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

distributors.js.coffee

Adding the distributors controller

2013-12-04 15:58:25 +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