Merge branch 'master' into dev-1.4.0

This commit is contained in:
Ben Wiederhake 2017-01-22 22:07:52 +01:00
commit c5929af862

View file

@ -3,8 +3,7 @@ Telegram-Purple Unofficial (Beta)
Telegram-purple is a Libpurple protocol plugin that adds support for the Telegram messenger.
I keep getting many questions about this plugin in my E-mail, so I've created a
[telegram group chat](goo.gl/VudXys) for
I keep getting many questions about this plugin in my E-mail, so I've created a [telegram group chat] (https://goo.gl/VudXys) for
telegram-purple related discussions or questions.
Installation
@ -303,7 +302,7 @@ FAQ
Telegram group chat for telegram-purple or libtgl related discussions or questions:
- https://goo.gl/QHttTR
- https://goo.gl/VudXys
Submitting Bug Reports