Dallon Feldner cc5b4246ed Merge branch 'refactor/deployment' into 0.7-feature/module-dashboard ...

Conflicts:
	bin/dpd
	lib/client/deploy.js
	lib/config-loader.js
	lib/internal-resources/dashboard.js
	lib/internal-resources/dashboard/index.ejs
	lib/internal-resources/dashboard/stylesheets/layout.less
	lib/internal-resources/dashboard/stylesheets/style.css
	lib/internal-resources/dashboard/stylesheets/style.less
	lib/internal-resources/internal-resources.js
	lib/resources/dashboard/bootstrap

2012-12-05 10:23:08 -07:00

..

dashboard

Merge branch 'refactor/deployment' into 0.7-feature/module-dashboard

2012-12-05 10:23:08 -07:00

client-lib.js

Added modules sidebar

2012-11-21 11:57:07 -07:00

dashboard.js

Merge branch 'refactor/deployment' into 0.7-feature/module-dashboard

2012-12-05 10:23:08 -07:00

files.js

added dir to server options - for booting in other directories than process.cwd()

2012-12-01 13:18:00 -08:00

internal-deployments.js

Merge branch 'refactor/deployment' into 0.7-feature/module-dashboard

2012-12-05 10:23:08 -07:00

internal-modules.js

Minor dashboard refactoring

2012-12-05 10:09:48 -07:00

internal-resources.js

Merge branch 'refactor/deployment' into 0.7-feature/module-dashboard

2012-12-05 10:23:08 -07:00