Skip to content

Commit

Permalink
Merge branch 'master' into greenkeeper/govuk_frontend_toolkit-7.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
gemmaleigh authored Jul 28, 2017
2 parents 0871deb + 9a5b965 commit 43263a9
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
14 changes: 14 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,17 @@ branches.

Please see our [git style guide](https://github.com/alphagov/styleguides/blob/master/git.md)
which describes how we prefer git history and commit messages to read.

## To release a new version

Update [CHANGELOG.md](https://github.com/alphagov/govuk_prototype_kit/blob/master/CHANGELOG.md) to summarise the changes made since the last release.

To see the commits to be summarised in the changelog since the last release, [compare the latest-release branch with master](https://github.com/alphagov/govuk_prototype_kit/compare/latest-release...master).

Propose a new version number in [VERSION.txt](https://github.com/alphagov/govuk_prototype_kit/blob/master/VERSION.txt) and update line 4 in [package.json](https://github.com/alphagov/govuk_prototype_kit/blob/master/package.json#L4) with the new version number.

Open a new pull request with a single commit including the above changes.

[Here is an example for v6.1.0](https://github.com/alphagov/govuk_prototype_kit/commit/53e36d79a994ce3649b53f4008370cd75068c27c).

Once merged into master a new version will be built.
4 changes: 3 additions & 1 deletion LICENCE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
Copyright (C) 2014 HM Government (Government Digital Service)
The MIT License

Copyright (C) 2014 Crown Copyright (Government Digital Service)

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down

0 comments on commit 43263a9

Please sign in to comment.