Merge remote-tracking branch 'origin/master' into develop

5c87b804 · Richard van der Hoff · 67a7ed1e · d8c877fe · 5c87b804
Commit 5c87b804 authored 8 years ago by Richard van der Hoff
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -36,7 +36,7 @@ For the web app:

 - **Browser**: Chrome, Safari, Firefox? which version?
 - **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
- **URL**: riot.im/develop / riot.im/app / somewhere else?
+- **URL**: riot.im/develop / riot.im/app / somewhere else? If a private server, what version of riot-web?

 For the desktop app: