Rafael Schouten 58e6379e43 Merge branch 'master' into fix_units ...

Conflicts:
	app/assets/javascripts/admin/products/units_controller.js.coffee

2014-07-14 15:10:26 +01:00

..

admin

Merge branch 'master' into fix_units

2014-07-14 15:10:26 +01:00

darkswarm

Patching a minor bug

2014-07-11 17:02:43 +10:00

search

Upgrading Foundation, starting to work through regression issues

2014-03-27 13:01:01 +11:00

shared

Adding some basic animations, upgrading Angular Foundation

2014-06-25 13:59:22 +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

Pulling some structure out of directives

2014-07-11 12:45:08 +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