Rohan Mitchell bf61d12bfa Merge branch 'simple-order-cycles' ...

Conflicts:
	app/views/admin/order_cycles/_row.html.haml

2014-10-23 12:11:34 +11:00

..

admin

Merge branch 'simple-order-cycles'

2014-10-23 12:11:34 +11:00

darkswarm

Merge migrate_ent_types into reg

2014-10-17 10:20:48 +11:00

shared

move text angular files

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

store

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

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

templates

Require user to choose producer or not

2014-10-17 12:29:51 +11: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