FlashpointProject / launcher

66%

master: 61%

LAST BUILD ON BRANCH keep-archive-key

branch: keep-archive-key

CHANGE BRANCH

x

Reset

Sync Branches

• keep-archive-key
• add-issue-templates
• add-issue-templates-test
• back-socket-layer
• bugfix/escape-single-quotes
• colin969-patch-1
• credits
• curate-hotfix
• curation_improvements
• daemons
• dependabot/npm_and_yarn/electron-10.1.3
• dependabot/npm_and_yarn/electron-13.6.6
• dependabot/npm_and_yarn/electron-17.2.0
• dependabot/npm_and_yarn/electron-9.4.0
• dependabot/npm_and_yarn/follow-redirects-1.14.7
• dependabot/npm_and_yarn/minimist-1.2.6
• dependabot/npm_and_yarn/terser-5.14.2
• dependabot/npm_and_yarn/typeorm-0.2.25
• dependabot/npm_and_yarn/url-parse-1.5.7
• dependabot/npm_and_yarn/ws-7.4.6
• deps
• develop
• disableExtreme
• feat/execmap-wine-mac
• feat/spawn-not-execfile
• feature/199-Sort-by-a-field-in-a-list-by-clicking-on-the-header
• feature/app_overrides
• feature/child-curations-updated
• feature/dbedits_zips
• feature/ext_events
• feature/extensions
• feature/extreme-playlists
• feature/fancy_checkboxes
• feature/game_playlist_context
• feature/logger
• feature/remote-curate
• feature/rework-websockets
• feature/tagfilters
• feature/update_feed
• fix-linux
• fix-mac-config
• fix-output
• fix/0kb-prefs-hang
• fix/getrootpath
• fix/getrootpath-breadth-first
• fix/logosets
• fix/mac-7z
• fix/non-windows-kill
• fix/non-windows-spawn-updated
• fix/unreadable-promises
• fix/update-electron
• hotfix
• hotfix/10.1.1
• hotfix/10.1.3
• hotfix/10.1.4
• hotfix/10.1.5
• hotfix/10.1.7
• hotfix/9.0.1
• hotfix/9.0.3
• hotfix/9.0.4
• improve-meta-edits
• issues/198-Logo-Set-images-not-centering-correctly
• issues/229-Hiding-the-Original-Description-and-Notes-if-they're-empty
• l10n_develop
• lint_workflow
• linux_core
• log_uploads
• log_watcher
• mad4fp
• master
• minor_fixes
• new-tests
• patch-1
• pre-db
• refactor/move-app-state-to-redux-store
• refs/tags/9.0.0
• refs/tags/Flashpoint-7.1
• refs/tags/Flashpoint-8.0
• release/10.0.0
• release/10.1.2
• release/9.0.0
• release/9.1.0
• revert-100-deps
• rewrite-game-manager
• setup
• single-instance
• small_reqs
• spelling
• testing-testing-123
• update-translations
• user-select-none

Merge 746bbf876 into a7e015575