Rohan Mitchell 213242627e Merge branch 'master' into redesign-phase-2 ...

Conflicts:
	app/views/home/_hubs.html.haml

2015-07-01 15:44:36 +10:00

..

admin

Merge branch 'master' into rob-github-fixes

2015-06-16 15:05:01 +10:00

darkswarm

Merge branch 'master' into redesign-phase-2

2015-07-01 15:44:36 +10:00

shared

Make brand story animate slide down/up

2015-06-26 15:54:25 +10:00

store

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

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

templates

Merge branch 'master' into redesign

2015-06-16 16:57:09 +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