Richard van der Hoff bb1854814c Merge pull request #1951 from vector-im/dbkr/dont_redirect_email_verify ... Don't redirect to mobile app if verifying 3pid		2016-08-11 12:50:06 +01:00
..
components	Merge branch 'develop' into fix-emoji	2016-08-11 14:51:17 +05:30
notifications	Improve handling of notification rules we can't parse	2016-04-15 12:42:03 +01:00
skins/vector	Merge pull request #1942 from vector-im/dbkr/multi_invite	2016-08-11 12:34:13 +01:00
vector	comment typo	2016-08-11 12:49:57 +01:00
component-index.js	Merge branch 'develop' into fix-emoji	2016-08-11 14:51:17 +05:30
header	copyrights for 2016	2016-01-07 04:17:56 +00:00
VectorConferenceHandler.js	click on group call thumbnail should return you to the group call, not the 1:1	2016-04-12 02:27:35 +01:00