Rafael Schouten 55f4415c0d Merge branch 'master' into cleanup ...

Conflicts:
	app/assets/javascripts/darkswarm/services/hubs.js.coffee
	app/views/home/_hubs.html.haml
	app/views/producers/_filters.html.haml
	app/views/producers/index.html.haml

2014-09-25 19:42:20 +10:00

..

admin

Merging master into all the things

2014-09-12 13:28:30 +10:00

darkswarm

Merge branch 'master' into cleanup

2014-09-25 19:42:20 +10:00

shared

Removing a couple of pointless files

2014-07-30 13:45:37 +10:00

templates

Merge branch 'master' into cleanup

2014-09-25 19:42:20 +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