Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.rst
  • Loading branch information
delneg committed Oct 21, 2018
2 parents 050e4c1 + 1a05e4d commit 7061bea
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.rst
Expand Up @@ -30,7 +30,7 @@ P.S. Don't forget to change CHAT_WS_SERVER_HOST && CHAT_WS_SERVER_PORT && CHAT_W
Documentation
-------------

The full documentation will be (soon) at https://django-private-chat.readthedocs.io , for now just check the docstrings =)
The full documentation is (finally) at https://django-private-chat.readthedocs.io . You can also check the docstrings & this readme.

Example project
---------------
Expand Down

0 comments on commit 7061bea

Please sign in to comment.