Skip to content

Commit

Permalink
Merge branch '1.2-cleanup-docs'
Browse files Browse the repository at this point in the history
  • Loading branch information
@corpsee
corpsee committed Jul 3, 2019
2 parents 746d0ab + 5420bba commit 99d20bd
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 61 deletions.
8 changes: 0 additions & 8 deletions .github/FUNDING.yml
View file

This file was deleted.

15 changes: 8 additions & 7 deletions README.md
View file
Expand Up @@ -16,11 +16,12 @@

Actual PHP Censor versions and release branches:

| Version | Branch | Status | Minimal PHP Version |
| :----------------- | :------------- | :-------------------------------- | :------------------ |
| `1.0` | `release-1.0` | Last stable version | `5.6` |
| `1.1` | `release-1.1` | Current stable version | `5.6` |
| `1.2` | `master` | Future stable minor version (WIP) | `5.6` |
| Version | Branch | Status | Minimal PHP Version |
| :----------------- | :------------- | :-------------------------------- | :------------------ |
| `1.0` | `release-1.0` | Last stable version | `5.6` |
| `1.1` | `release-1.1` | Current stable version | `5.6` |
| `1.2` | `master` | Future stable minor version (WIP) | `5.6` |
| `2.0` | `pre-release-2.0` | Future stable major version (WIP) | `7.1` |

[![Dashboard](docs/screenshots/dashboard.png)](docs/screenshots/dashboard.png)

Expand Down Expand Up @@ -77,11 +78,11 @@ CleanBuild, CopyBuild, Deployer, Env, Git, Grunt, Gulp, PackageBuild, Phar, Phin

## Changelog

[Versions changelog](ROADMAP.md).
[Versions changelog](CHANGELOG.md).

## Roadmap

[PHP Censor roadmap](ROADMAP.md).
See [milestones](https://github.com/php-censor/php-censor/milestones).

## Installing

Expand Down
46 changes: 0 additions & 46 deletions ROADMAP.md
View file

This file was deleted.

0 comments on commit 99d20bd

Please sign in to comment.