Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'develop' into feat/django3.2-support
  • Loading branch information
vinitkumar committed May 17, 2021
2 parents cfe5ea5 + 6c2b057 commit fcd8d5b
Show file tree
Hide file tree
Showing 11 changed files with 4 additions and 3,926 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Expand Up @@ -25,6 +25,6 @@ Use 'x' to check each item: [x] I have ...
-->

* [ ] I have opened this pull request against ``develop``
* [ ] I have updated the **CHANGELOG.rst**
* [ ] I have added or modified the tests when changing logic
* [ ] I have followed [the conventionnal commits guidelines](http://conventionnalcommits.org/) to add meaningful information into the changelog
* [ ] I have read the [contribution guidelines ](https://github.com/django-cms/django-cms/blob/develop/CONTRIBUTING.rst) and I have joined #workgroup-pr-review on [Slack](https://www.django-cms.org/slack) to find a “pr review buddy” who is going to review my pull request.
1 change: 1 addition & 0 deletions CHANGELOG.rst
Expand Up @@ -24,6 +24,7 @@ Unreleased
* Fixed template label nested translation
* Few changes in docs/contributing/code.rst
* Add support for Django 3.2 LTS version
* removed zh and zh_hans translation (keep zh_CN and zh_TW)

3.8.0 (2020-10-28)
==================
Expand Down
2 changes: 2 additions & 0 deletions CONTRIBUTING.rst
Expand Up @@ -34,6 +34,8 @@ Here’s what the pull request process looks like in brief:

To learn more about basic requirements and standards of code contribution, please familiarize yourself with our comprehensive `documentation <https://docs.django-cms.org/en/latest/contributing/code.html#>`_.

django CMS commits follow the [Conventionnal Commits Guideline](http://conventionnalcommits.org/), please try to follow the Guidelines in your commit messages to ease our review&merge process.

Receive rewards for submitting pull requests
--------------------------------------------

Expand Down
Binary file removed cms/locale/zh-Hans/LC_MESSAGES/django.mo
Binary file not shown.

0 comments on commit fcd8d5b

Please sign in to comment.