Skip to content

Commit

Permalink
Merge d13e6fe into bd8f7ea
Browse files Browse the repository at this point in the history
  • Loading branch information
idmontie committed Dec 10, 2015
2 parents bd8f7ea + d13e6fe commit 3efa2e3
Show file tree
Hide file tree
Showing 6 changed files with 595 additions and 186 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ php:
- 5.5.9
- 5.5
- 5.6
- 7.0
- hhvm

# Pending coduo/php-humanizer being 7.0 ready
# - 7.0
# - hhvm

install:
- composer install --no-interaction --prefer-source
Expand Down
6 changes: 0 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,6 @@ Nectary is currently only available through GitHub, to install, add the followin
}
```

If you wish to generate excerpts, you will need to install Tidy:

```
sudo apt-get install php5-tidy
```

## Developing

If you add a class or change a namespace, remember to
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"classmap" : [ "src/" ]
},
"require": {
"xamin/handlebars.php": "dev-master"
"xamin/handlebars.php": "dev-master",
"coduo/php-humanizer": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "4.8.*",
Expand Down
Loading

0 comments on commit 3efa2e3

Please sign in to comment.