Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Anahkiasen committed Aug 4, 2014
2 parents d5bbb27 + 960f106 commit fa5aeab
Show file tree
Hide file tree
Showing 3 changed files with 237 additions and 317 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 3.4.4

- Last release for PHP 5.3

## 3.4.3

- [add] Added step parameter to `Select::range()` method
Expand Down
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@
"require": {
"php": ">=5.3.0",
"anahkiasen/html-object": "~1.4",
"illuminate/config": "4.1.*",
"illuminate/container": "4.1.*",
"illuminate/http": "4.1.*",
"illuminate/routing": "4.1.*",
"illuminate/session": "4.1.*",
"illuminate/translation" :"4.1.*"
"illuminate/config": "4.0.*",
"illuminate/container": "4.0.*",
"illuminate/http": "4.0.*",
"illuminate/routing": "4.0.*",
"illuminate/session": "4.0.*",
"illuminate/translation" :"4.0.*"
},
"require-dev": {
"phpunit/phpunit": "~4.1.4",
"mockery/mockery": "~0.9.1",
"illuminate/database": "4.1.*"
"illuminate/database": "4.0.*"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit fa5aeab

Please sign in to comment.