Skip to content

Commit

Permalink
[UPMERGE] 1.12 -> 1.13 (Sylius#15958)
Browse files Browse the repository at this point in the history
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml).

**Remember!** The upmerge should always be merged with using `Merge pull
request` button.

In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/1.13 -m "Resolve conflicts between 1.12 and 1.13"
```

If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/Sylius` repository.

Once the conflicts are resolved, please run `git merge --continue` and
change the commit title to
```
Resolve conflicts between 1.12 and 1.13
```
  • Loading branch information
jakubtobiasz authored Mar 7, 2024
2 parents 1fab78f + 0c4957f commit 65d4294
Showing 1 changed file with 2 additions and 16 deletions.
18 changes: 2 additions & 16 deletions docs/book/support/index.rst
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Support
=======

Besides documentation we have a very friendly community which provides support for all Sylius users seeking help!
Besides documentation, we have a very friendly community that supports all Sylius users seeking help!

At Sylius we have 3 main channels for communication and support.
At Sylius we have 2 main channels for communication and support.

Slack
-----
Expand All @@ -26,20 +26,6 @@ Slack requires inviting new members, but this can be done automatically, just go
enter your email and you will get an invitation.
If possible, please use your GitHub username - it will help us to recognize each other easily!

Forum
-----

In response to the rapid growth of our Ecosystem, we decided it is necessary to launch a brand new platform for support
and exchanging experience. On the contrary to Slack, our Forum is much easier to follow, on Slack unless you are a part
of the discussion when it is happening, it might be difficult to catch up when you have been offline.
Forum has a search engine so it is convenient to browse for what is interesting for you.

The Sylius Community Forum is meant for everyone who is interested in eCommerce technology and Sylius. We invite both existing
and new community members to join the discussion and help shape the ecosystem, products & services we are building.
Get to know other community members, ask for support, suggest an improvement or discuss your challenge.

You can register via email, Twitter & GitHub by going to `https://forum.sylius.com/ <https://forum.sylius.com/>`_ and hitting the “Sign-Up” button.

StackOverflow
-------------

Expand Down

0 comments on commit 65d4294

Please sign in to comment.