Weblate 8216d8999c Merge branch 'develop' of https://github.com/vector-im/riot-web into develop ... Conflicts: src/i18n/strings/cs.json src/i18n/strings/fr.json src/i18n/strings/nb_NO.json src/i18n/strings/nl.json src/i18n/strings/pt_BR.json		2017-10-12 16:24:36 +00:00
..
components	Fix bug that made sub list placeholders not show for ILAG etc.	2017-10-04 15:58:40 +01:00
i18n/strings	Merge branch 'develop' of https://github.com/vector-im/riot-web into develop	2017-10-12 16:24:36 +00:00
notifications	Mark some strings as translatable	2017-09-23 13:46:51 +02:00
skins/vector	Merge pull request #3849 from psaavedra/set_default_federate_by_settings	2017-10-11 16:28:25 +02:00
utils	PR feedback	2016-12-16 16:24:24 +00:00
vector	ElectronPlatform: Import desktopCapturer explicitly	2017-09-25 17:19:04 +02:00
header
VectorConferenceHandler.js	replace q method calls with bluebird ones	2017-07-13 00:50:01 +01:00