Skip to content

Commit

Permalink
Merge pull request #65 from sir-dunxalot/remove-vendor-lib
Browse files Browse the repository at this point in the history
v1.0.0
  • Loading branch information
Duncan Walker committed May 22, 2016
2 parents 2935cb2 + e988b28 commit 641ab4f
Show file tree
Hide file tree
Showing 99 changed files with 1,871 additions and 3,868 deletions.
7 changes: 5 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
language: node_js
node_js:
- "4.4"
- "0.12"

sudo: false

Expand All @@ -11,7 +11,7 @@ cache:

env:
- EMBER_TRY_SCENARIO=default
- EMBER_TRY_SCENARIO=ember-1-13
- EMBER_TRY_SCENARIO=ember-1.13
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
Expand All @@ -22,6 +22,9 @@ matrix:
- env: EMBER_TRY_SCENARIO=ember-canary

before_install:
# - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
# - "npm config set spin false"
# - "npm install -g npm@^2"
- mkdir travis-phantomjs
- wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2
- tar -xvf $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -C $PWD/travis-phantomjs
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2015
Copyright (c) 2016

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
Loading

0 comments on commit 641ab4f

Please sign in to comment.