Skip to content

Commit

Permalink
Merge pull request #13 from SimonMueller/develop
Browse files Browse the repository at this point in the history
Release v1.0.2
  • Loading branch information
SimonMueller authored Jan 6, 2018
2 parents 2077886 + 5ccaabc commit 7c72680
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 8 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,9 @@
* Breadcrumb overflow handling (wrap)
* Correct padding of footer widget
* Fix display of publish date

# v1.0.2
## 6.01.2018

1. [](#new)
* Added CONTRIBUTING.md
7 changes: 7 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Contributing

First off, thank you for your support to this project :smiley:. If you would like to contribute to this project you are more than welcome! Just open an Issue or a Pull Request with your idea or suggested change.

Please keep the [Code of Conduct](CODE_OF_CONDUCT.md) in mind while contributing.

This repo uses the GitFlow branching model. The core concept of the GitFlow methodology is that development happens in the develop branch, but new features and functionality are created in seperate feature branches that are merged into develop when complete. Releases merge develop into master, and you can apply hotfix branches as needed during the release process. ([Grav Development GitHub](https://learn.getgrav.org/advanced/grav-development#github-setup))
6 changes: 0 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -194,12 +194,6 @@ If you want to set pluspunkt as the default theme, you can do so by following th

Once this is done, you should be able to see the new theme on the frontend. Keep in mind any customizations made to the previous theme will not be reflected as all of the theme and templating information is now being pulled from the **pluspunkt** folder.

# Contributing

If you would like to contribute to this project you are more than welcome! Just open an Issue or a Pull Request with your idea or suggested change.

> [Code of Conduct](CODE_OF_CONDUCT.md)

# License

Copyright (C) 2017 Simon Müller
Expand Down
2 changes: 1 addition & 1 deletion blueprints.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: pluspunkt
version: 1.0.1
version: 1.0.2
description: A simple, responsive and modern Grav theme built with Kube
author:
name: Simon Müller
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "grav-theme-pluspunkt",
"version": "1.0.1",
"version": "1.0.2",
"description": "A simple, responsive and modern Grav theme built with Kube",
"keywords": [
"pluspunkt",
Expand Down

0 comments on commit 7c72680

Please sign in to comment.