diff options
author | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-19 09:44:50 +0200 |
---|---|---|
committer | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-19 09:44:50 +0200 |
commit | ff21d4d93bfa76a8ad20660a3513a0f122905b12 (patch) | |
tree | fa63ee538b2ad5e18c414eabc98bebed0fdc54fa /webclient/js/angular-route.js | |
parent | Fill user page with avatar, display name and matrix id (diff) | |
parent | show private room_ids rather than nulls in notifs if there is no room_alias (diff) | |
download | synapse-ff21d4d93bfa76a8ad20660a3513a0f122905b12.tar.xz |
Merge remote-tracking branch 'origin/master' into user_page
Diffstat (limited to 'webclient/js/angular-route.js')
0 files changed, 0 insertions, 0 deletions