diff options
| author | Johannes <johannes.ewald@roomieplanet.de> | 2012-06-23 18:21:08 +0400 |
|---|---|---|
| committer | Johannes <johannes.ewald@roomieplanet.de> | 2012-06-23 18:21:08 +0400 |
| commit | 65207b9cee1002fad9c1ec3e3e7ff359fe1f905c (patch) | |
| tree | 2bb46798016f4ef255d26c9d471710718788754e | |
| parent | f8333d32b4f4135e8a0ce7553cda6a6f3c32e099 (diff) | |
| parent | 0a54b239a1cb5cb6ebc1c6dfda15daf2f324e1e8 (diff) | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | LICENSE | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 3c9eff3..2d7d25f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,4 @@ node_js: - 0.6
script:
- - mocha
\ No newline at end of file + - npm test
\ No newline at end of file @@ -15,4 +15,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file |