DallonF 3081125ab4 Merge branch '0.6' of github.com:deployd/deployd into 0.6 ...

Conflicts:
	test/support/keys.json

2012-08-02 09:58:35 -07:00

..

.dpd

fixed deployment set/getConfig(), fixed deployment.sanitize() test

2012-07-23 15:03:59 -07:00

node_modules

updated gitignore to only ignore root node_modules folder

2012-07-31 08:54:27 -07:00

public

resolved conflicts

2012-08-02 09:33:26 -07:00

resources

Renamed settings.json to config.json and fixed bugs relating to renaming resources

2012-08-02 09:41:17 -07:00

app.dpd

fixed a bug where cancel() was not canceling an event after internal event-io occured

2012-07-27 12:45:20 -07:00

clean

Removed examples

2012-07-09 09:59:05 -07:00