Commit 5afec173 authored by Gustavo Pinzon's avatar Gustavo Pinzon
Browse files

Merge branch 'master' into moveGrainsFunction

parents 146ef891 4f48d219
...@@ -46,7 +46,7 @@ Please have a look at our online documentation for: ...@@ -46,7 +46,7 @@ Please have a look at our online documentation for:
* `Examples`_ * `Examples`_
* And a number of detailed tutorials * And a number of detailed tutorials
If you find bugs, need help, or want to talk to the developers, we use a `riot`_/`matrix.org`_ **chat room** for organisation, please join it `here`_ and come and talk to us -- it is easy, there is a chat client that can run in your web broswer. If you find bugs, need help, or want to talk to the developers, we use a `element.io`_/`matrix.org`_ **chat room** for organisation, please join it `here`_ and come and talk to us -- it is easy, there is a chat client that can run in your web broswer.
All you need to do is choose a user name! All you need to do is choose a user name!
...@@ -54,9 +54,10 @@ All you need to do is choose a user name! ...@@ -54,9 +54,10 @@ All you need to do is choose a user name!
.. _General introduction: https://ttk.gricad-pages.univ-grenoble-alpes.fr/spam/intro.html .. _General introduction: https://ttk.gricad-pages.univ-grenoble-alpes.fr/spam/intro.html
.. _Examples: https://ttk.gricad-pages.univ-grenoble-alpes.fr/spam/spam_examples/index.html .. _Examples: https://ttk.gricad-pages.univ-grenoble-alpes.fr/spam/spam_examples/index.html
.. _riot: https://about.riot.im/ .. _element.io: https://element.io/features
.. _matrix.org: https://matrix.org/ .. _matrix.org: https://matrix.org/
.. _here: https://riot.im/app/#/room/#spam:matrix.org .. _here: https://app.element.io/#/room/#spam:matrix.org
Changelog Changelog
......
...@@ -43,15 +43,15 @@ Head over to :ref:`howToContribute` to find out more. ...@@ -43,15 +43,15 @@ Head over to :ref:`howToContribute` to find out more.
**Spam** is built on top of **NumPy** and **SciPy**, and has some optimised C/C++ functions for speed. **Spam** is built on top of **NumPy** and **SciPy**, and has some optimised C/C++ functions for speed.
There is a `riot`_/`matrix.org`_ **chat room** for **spam**, please join it `here`_ and come and talk to us -- it is easy, there is a chat script that can run in your web broswer. There is a `element.io`_/`matrix.org`_ **chat room** for **spam**, please join it `here`_ and come and talk to us -- it is easy, there is a chat script that can run in your web broswer.
All you need to do is choose a user name! All you need to do is choose a user name!
.. _scripts: https://ttk.gricad-pages.univ-grenoble-alpes.fr/spam/scripts.html .. _scripts: https://ttk.gricad-pages.univ-grenoble-alpes.fr/spam/scripts.html
.. _module index: https://ttk.gricad-pages.univ-grenoble-alpes.fr/spam/py-modindex.html .. _module index: https://ttk.gricad-pages.univ-grenoble-alpes.fr/spam/py-modindex.html
.. _Gallery of Examples: https://ttk.gricad-pages.univ-grenoble-alpes.fr/spam/spam_examples/index.html .. _Gallery of Examples: https://ttk.gricad-pages.univ-grenoble-alpes.fr/spam/spam_examples/index.html
.. _riot: https://about.riot.im/ .. _element.io: https://element.io/features
.. _matrix.org: https://matrix.org/ .. _matrix.org: https://matrix.org/
.. _here: https://riot.im/app/#/room/#spam:matrix.org .. _here: https://app.element.io/#/room/#spam:matrix.org
Issues? Issues?
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment