Merge remote-tracking branch 'origin/master'

This commit is contained in:
Martin Mahner 2019-07-23 11:09:52 +02:00
commit 60e86cf185

View file

@ -29,6 +29,8 @@ The static files are not shipped with the project repository and need to be
compiled manually. This is necessary since compiled CSS/JS files lead to too compiled manually. This is necessary since compiled CSS/JS files lead to too
many merge conflicts during development. many merge conflicts during development.
.. code-block:: bash
$ npm install # Installs the node dependencies and compiles $ npm install # Installs the node dependencies and compiles
# the static files (JS/CSS). # the static files (JS/CSS).