Merge branch 'release-v0.2.3' of github.com:matrix-org/synapse

Conflicts:
	webclient/room/room-controller.js

1 files changed, 1 insertions, 0 deletions

diff --git a/webclient/settings/settings.html b/webclient/settings/settings.html
index 924812e7ae..c358a6e9d8 100644
--- a/webclient/settings/settings.html
+++ b/webclient/settings/settings.html
@@ -81,6 +81,7 @@
             <ul>
                 <li>/nick &lt;display_name&gt;: change your display name</li>
                 <li>/me &lt;action&gt;: send the action you are doing. /me will be replaced by your display name</li>
+                <li>/join &lt;room_alias&gt;: join a room</li>
                 <li>/kick &lt;user_id&gt; [&lt;reason&gt;]: kick the user</li>
                 <li>/ban &lt;user_id&gt; [&lt;reason&gt;]: ban the user</li>
                 <li>/unban &lt;user_id&gt;: unban the user</li>