Merge branch 'master' into 'master'

Consistent naming

fix two missed instances of the app name

See merge request !1716
This commit is contained in:
est 2016-09-26 12:20:23 +00:00
commit b0fa87c97c

View file

@ -21,7 +21,7 @@ Features include:
* Instantly share messages, images, videos and files of any kind within groups of any size * Instantly share messages, images, videos and files of any kind within groups of any size
* Voice and video 1-1 and conference calling via WebRTC * Voice and video 1-1 and conference calling via WebRTC
* See who's reading your messages with read receipts * See who's reading your messages with read receipts
* Communicate with users anywhere in the Matrix.org ecosystem - not just Vector users! * Communicate with users anywhere in the Matrix.org ecosystem - not just Riot users!
* Discover and invite users by email address * Discover and invite users by email address
* Participate in guest-accessible public rooms * Participate in guest-accessible public rooms
* Highly scalable - supports hundreds of rooms and thousands of users * Highly scalable - supports hundreds of rooms and thousands of users