Merge remote-tracking branch 'origin/3.1'

This commit is contained in:
Ingo Schommer 2013-10-21 00:08:50 +02:00
commit 20b3957c78
3 changed files with 3 additions and 2 deletions

View File

@ -13,7 +13,8 @@ and [installation from source](http://doc.silverstripe.org/framework/en/installa
## Bugtracker ## ## Bugtracker ##
Bugs are tracked on [github.com](https://github.com/silverstripe/framework/issues). Bugs are tracked on github.com ([framework issues](https://github.com/silverstripe/silverstripe-framework/issues),
[cms issues](https://github.com/silverstripe/silverstripe-cms/issues)).
Please read our [issue reporting guidelines](http://doc.silverstripe.org/framework/en/misc/contributing/issues). Please read our [issue reporting guidelines](http://doc.silverstripe.org/framework/en/misc/contributing/issues).
## Development and Contribution ## ## Development and Contribution ##

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 19 KiB

View File

@ -19,4 +19,4 @@ default:
selenium2: selenium2:
browser: firefox browser: firefox
SilverStripe\BehatExtension\Extension: ~ SilverStripe\BehatExtension\Extension: ~