Skip to content

[pull] master from shuup:master #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Aug 26, 2020
Merged

[pull] master from shuup:master #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ee955a
Release 2.1.2
tulimaki Aug 26, 2020
7c0df43
Post-release update for 2.1.2
tulimaki Aug 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

List all changes after the last release here (newer on top). Each change on a separate bullet point line.

## [2.1.2] - 2020-08-26

### Fixed

- Xtheme: fix editor template issue
- Simple CMS: make sure to pass optional parameters through kwargs in form


## [2.1.1] - 2020-08-26

### Added
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
# - Add ".post0.dev" suffix to VERSION variable here

NAME = 'shuup'
VERSION = '2.1.1.post0.dev'
VERSION = '2.1.2.post0.dev'
DESCRIPTION = 'E-Commerce Platform'
AUTHOR = 'Shoop Commerce Ltd.'
AUTHOR_EMAIL = 'shuup@shuup.com'
Expand Down