tonyair/silverstripe-versionfeed
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-versionfeed synced 2024-10-22 11:05:31 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #29 from scott1702/master

Browse Source 
update changelog for release
This commit is contained in:
Damian Mooyman 2015-11-19 15:23:12 +13:00
commit 84530d6678
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog.md
View File

@ -7,4 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [1.2.0]
* Changelog added.
* Added Scrutinizer support
* Add `ContentFilter.cache_lifetime` config to set the cache lifetime.
* Update alternate xml link tag to be W3 compliant
* Added CWP keyword

7
composer.json
View File

@ -14,5 +14,12 @@
{
"silverstripe/framework": ">=3.1",
"silverstripe/cms": ">=3.1"
},
"extra":
{
"branch-alias":
{
"dev-master": "1.2.x-dev"
}
}
}