From c681d5016e67e1aaa2b07a80da45e9ea67e6b924 Mon Sep 17 00:00:00 2001 From: Arnold Daniels Date: Fri, 12 Jul 2013 13:36:49 +0200 Subject: [PATCH] Using 'p' instead of 'j' in version Fixed broken composer.json --- README.md | 11 +++++------ composer.json | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d08e637f..0de7b362 100644 --- a/README.md +++ b/README.md @@ -25,18 +25,17 @@ For transparency and insight into our release cycle, and for striving to maintai Releases will be numbered with the following format: -`..-j` +`..-p` And constructed with the following guidelines: -* Breaking backward compatibility bumps the major (and resets the minor and patch) -* New additions without breaking backward compatibility bumps the minor (and resets the patch) -* Bug fixes and misc changes bumps the patch +* Breaking backward compatibility bumps the major +* New additions without breaking backward compatibility bumps the minor +* Bug fixes and misc changes bump the patch +* Additionally the version for the Jasny extensions will simply be incremented with each release and is prefixed with a 'p' For more information on SemVer, please visit [http://semver.org/](http://semver.org/). -Additionally the version for the Jasny extensions will simply be incremented with each release and is prefixed with a 'j'. - ## Bug tracker diff --git a/composer.json b/composer.json index e8f17ef1..046f33a0 100644 --- a/composer.json +++ b/composer.json @@ -8,5 +8,5 @@ , {"name": "Arnold Daniels", "email": "arnold@jasny.net", "homepage": "http://www.jasny.net"} ] , "license": "Apache-2.0" - , "replace": "twitter/bootstrap" + , "replace": { "twitter/bootstrap" : "2.3.1" } }