Rafael Schouten 9a6958573a Merge branch 'master' into bugfix ...

Conflicts:
	app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee

2014-10-12 21:19:02 +11:00

..

admin

Merge branch 'master' into bugfix

2014-10-12 21:19:02 +11:00

darkswarm

Merge branch 'master' into ent_types_frontend

2014-09-25 17:20:15 +10:00

search

Remove most references to suburbs - previously used by new_landing_page, no longer used.

2014-07-17 14:26:04 +10:00

shared

move text angular files

2014-10-03 16:43:56 +10:00

shop

Adding ze boilerplate

2014-02-07 13:55:25 +11:00

store

Fixing a couple of spec bugs

2014-04-08 18:09:02 +10:00

templates

Changing the markup to give a class where is a producer

2014-09-26 15:01:23 +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