Skip to content

Commit 4f40fef

Browse files
committed
Merge branch 'release/1.1.0' into develop
2 parents 4941eae + 5c9fb74 commit 4f40fef

File tree

5 files changed

+68
-56
lines changed

5 files changed

+68
-56
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
language: php
22

33
php:
4-
- 5.3
54
- 5.4
65
- 5.5
6+
- 5.6
7+
- hhvm
78

89
before_script:
910
- curl -s http://getcomposer.org/installer | php

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
}
1111
],
1212
"require": {
13-
"php": ">=5.3.0",
14-
"illuminate/support": "4.1.*"
13+
"php": ">=5.4.0",
14+
"illuminate/support": "4.2.*"
1515
},
1616
"require-dev": {
1717
"phpunit/phpunit": "3.7.*",

composer.lock

Lines changed: 50 additions & 51 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

readme.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ If you have any Problems with the Documentation please open an Issue.
3131
// composer.json
3232

3333
"require": {
34-
"php": ">=5.3.0",
35-
"hettiger/seo-aggregator": "1.0.*",
34+
"php": ">=5.4.0",
35+
"hettiger/seo-aggregator": "1.1.*",
3636
// ...
3737
},
3838
```
@@ -42,6 +42,12 @@ If you have any Problems with the Documentation please open an Issue.
4242
An Update is always considered safe on changes regarding the last digit of the Version Number. Never update when the
4343
first or second digit has changed without looking into the [Release Notes](release-notes.md).
4444

45+
| Versions | Laravel compatibility | PHP compatibility |
46+
| -------- | --------------------- | ----------------- |
47+
| 1.1.* | Laravel 4.2 | HHVM, 5.4+ |
48+
| 1.0.* | Laravel 4.1 | 5.3+ |
49+
| 0.\*.* | Laravel 4.1 | 5.3+ |
50+
4551
### License
4652

4753
SEO Aggregator is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)

release-notes.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
## SEO Aggregator
22

3+
#### Version: 1.1.0
4+
5+
###### Achievements
6+
7+
* Updated SEO Aggregator to work with Laravel 4.2
8+
39
#### Version: 1.0.1
410

511
###### Achievements

0 commit comments

Comments
 (0)