Manually merge branch 'feature/move-harness-to-cmd' into develop

Conflicts:
	revel/test.go
This commit is contained in:
Justin Li
2014-10-30 10:55:57 -04:00
8 changed files with 1720 additions and 3 deletions

View File

@@ -4,7 +4,7 @@ import (
"encoding/json"
"fmt"
"github.com/revel/revel"
"github.com/revel/revel/harness"
"github.com/revel/cmd/harness"
"github.com/revel/modules/testrunner/app/controllers"
"io"
"io/ioutil"