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

This commit is contained in:
Richard van der Hoff 2017-02-20 09:14:22 +00:00
commit 5c87b8045a

View File

@ -36,7 +36,7 @@ For the web app:
- **Browser**: Chrome, Safari, Firefox? which version? - **Browser**: Chrome, Safari, Firefox? which version?
- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc? - **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: For the desktop app: