…si_ptt

…evelop

* 'master' of https://github.com/vector-im/riot-web:
  Fix cleanup script not to remove extracted/bundles directories (element-hq#8764)

…evelop

* 'master' of https://github.com/vector-im/riot-web:
  Update issue templates

* develop:
  Update issue templates
  Fix cleanup script not to remove extracted/bundles directories (element-hq#8764)

* develop: (30 commits)
  [matrix] -> Matrix
  Nudge karma to 3.1.2
  set chrome path for travis CI explicitly
  Updated install spinner referenced in element-hq#8913
  Add support for localConfig at $appData/config.json. Move electron-config to $appData/electron-config.json
  Translated using Weblate (Hungarian)
  Update to electron 4.0.6
  Translated using Weblate (Spanish)
  Translated using Weblate (Norwegian Bokmål)
  Translated using Weblate (Hungarian)
  Translated using Weblate (Hindi)
  Translated using Weblate (Greek)
  Translated using Weblate (German)
  Translated using Weblate (Finnish)
  Translated using Weblate (Arabic)
  Translated using Weblate (Portuguese (Brazil))
  Translated using Weblate (Czech)
  Translated using Weblate (Swedish)
  Translated using Weblate (Swedish)
  Allow disabling update mechanism
  ...

…to anoa/jitsi_ptt

* develop: (75 commits)
  Support CI for matching branches on forks
  Update yarn.lock
  v1.0.4
  Prepare changelog for v1.0.4
  v1.0.4
  Released js-sdk & react-sdk
  Translated using Weblate (Irish)
  Translated using Weblate (English (United States))
  Added translation using Weblate (Irish)
  Update README.md grammar
  Cross-promote mobile apps
  Fix downstream branch fetching
  Update issue templates
  Declare the officially supported browsers in the README
  Update version number in issue templates
  Use the right CI branch
  Set up BuildKite for Chrome
  Lint doesn't need develop deps
  Remove Travis (CI)
  Add a basic BuildKite :pipeline:
  ...

* develop: (47 commits)
  Translated using Weblate (Romanian)
  Translated using Weblate (Finnish)
  Translated using Weblate (Dutch)
  Added translation using Weblate (Slovenian)
  bump olm version
  Use a different cookie to expire any cookies people may already have
  Step cookie down to 4 hours
  Fix autolaunch setting appearing toggled off
  Expire mobile guide cookie after 24 hours
  Don't try to save files the user didn't want to save
  v1.0.6
  Prepare changelog for v1.0.6
  v1.0.6
  Released js-sdk & react-sdk, and bump electron version
  Deleted translation using Weblate (English (United Kingdom))
  Translated using Weblate (Italian)
  Translated using Weblate (Irish)
  Translated using Weblate (Finnish)
  Translated using Weblate (Esperanto)
  Translated using Weblate (English (United Kingdom))
  ...

* develop: (249 commits)
  Clarify deployment scripts
  Add riot.im configuration files
  Enable reactions and edits for desktop
  Remove unused disable_identity_server config flag
  Improve wording in debug log sending in issue templates
  Require a rageshake description in mxSendRageshake
  Fetch deps
  Verify i18n in CI
  Upgrade dependencies
  v1.2.4
  Prepare changelog for v1.2.4
  v1.2.4
  Upgrade lodash
  Upgrade to JS SDK 2.1.1 and React SDK 1.3.1
  v1.2.3
  Prepare changelog for v1.2.3
  v1.2.3
  Upgrade to JS SDK 2.1.0 and React SDK 1.3.0
  Upgrade dependencies
  v1.2.3-rc.1
  ...

* develop: (22 commits)
  v1.3.0
  Prepare changelog for v1.3.0
  v1.3.0
  Upgrade to JS SDK 2.2.0 and React SDK 1.4.0
  Remove reactions feature flag from docs and config
  Remove edits feature flag from docs and config
  Remove reactions feature flag from docs and config
  Remove edits feature flag from docs and config
  cachebust config file requests
  v1.3.0-rc.3
  Prepare changelog for v1.3.0-rc.3
  v1.3.0-rc.3
  react-sdk rc.3
  v1.3.0-rc.2
  Prepare changelog for v1.3.0-rc.2
  v1.3.0-rc.2
  Upgrade to JS SDK 2.2.0-rc.2 and React SDK 1.4.0-rc.2
  Convert install-app-deps to subcommand
  v1.3.0-rc.1
  Prepare changelog for v1.3.0-rc.1
  ...