Permalink
Browse files

Merge branch '1.2' into 1.3

* 1.2:
  [Docs] Update year in copyright
  Correct grammar mistake in README
  • Loading branch information...
pamil committed Oct 9, 2018
2 parents b2dd5a3 + c438ac2 commit 6292042973189a92ca871c832dc4e6961544228d
Showing with 2 additions and 2 deletions.
  1. +1 −1 README.md
  2. +1 −1 docs/conf.py
@@ -44,7 +44,7 @@ Official plugins
This is the list of officially supported Sylius plugins: This is the list of officially supported Sylius plugins:
- [Admin Order Creation Plugin](https://github.com/Sylius/AdminOrderCreationPlugin) - - [Admin Order Creation Plugin](https://github.com/Sylius/AdminOrderCreationPlugin) -
allows to create orders directly from the administrator panel allows creating orders directly from the administrator panel
- [Customer Order Cancellation Plugin](https://github.com/Sylius/CustomerOrderCancellationPlugin) - - [Customer Order Cancellation Plugin](https://github.com/Sylius/CustomerOrderCancellationPlugin) -
allows customer to cancel a placed order which has not been processed yet allows customer to cancel a placed order which has not been processed yet
- [Customer Reorder Plugin](https://github.com/Sylius/CustomerReorderPlugin) - - [Customer Reorder Plugin](https://github.com/Sylius/CustomerReorderPlugin) -
@@ -7,7 +7,7 @@
source_suffix = '.rst' source_suffix = '.rst'
master_doc = 'index' master_doc = 'index'
project = 'Sylius' project = 'Sylius'
copyright = u'2011-2017, Paweł Jędrzejewski' copyright = u'2011-2018, Paweł Jędrzejewski'
version = '' version = ''
release = '' release = ''
exclude_patterns = ['_includes/*.rst'] exclude_patterns = ['_includes/*.rst']

0 comments on commit 6292042

Please sign in to comment.