Robert Swain 5ffc9c56ee Merge branch 'develop' into rob/electron-screensharing		2017-09-12 10:55:01 +02:00
..
components	Add comment to update shouldComponentUpdate	2017-09-11 18:30:43 +01:00
i18n/strings	Translated using Weblate (German)	2017-09-04 07:58:09 +00:00
notifications	Translate notification strings	2017-05-30 17:39:41 +01:00
skins/vector	Revert "Implement sticky date separators"	2017-09-06 17:36:43 +01:00
utils	PR feedback	2016-12-16 16:24:24 +00:00
vector	ElectronPlatform.js: Add Jitsi screensharing support	2017-09-04 09:33:08 +02:00
header	copyrights for 2016	2016-01-07 04:17:56 +00:00
VectorConferenceHandler.js	replace q method calls with bluebird ones	2017-07-13 00:50:01 +01:00