Compare commits
merge into: cwtch.im:master
cwtch.im:master
cwtch.im:managed-groups
cwtch.im:ep
cwtch.im:offline-messages
cwtch.im:acl-v2
cwtch.im:overlays
cwtch.im:android_file_download_fix
cwtch.im:hybridgroups
cwtch.im:enhanced-permissions
cwtch.im:settings
cwtch.im:post-stable-fixes
cwtch.im:fixups
cwtch.im:stable-blockers
cwtch.im:search
cwtch.im:crForceDisconn
cwtch.im:server-update
cwtch.im:conversation_search
cwtch.im:fixCR
cwtch.im:deletecontactfix
cwtch.im:startupbugs
cwtch.im:font-setting
cwtch.im:events
cwtch.im:handleStatus
cwtch.im:fuzzbot
cwtch.im:code-fixes
cwtch.im:fixpanic
cwtch.im:autodownload
cwtch.im:esi
cwtch.im:eventhooks
cwtch.im:autobindings
cwtch.im:contactRetryDisconn
cwtch.im:priority
cwtch.im:createProfileAttr
cwtch.im:serverAccept
cwtch.im:connectionLogic
cwtch.im:fixdeletep2
cwtch.im:cached_tokens
cwtch.im:indents_and_tools
cwtch.im:go_update
cwtch.im:protocl_engine_shutdown_fix
cwtch.im:timeout_fixes_tokens
cwtch.im:fixShutdown
cwtch.im:networkAfterOnline
cwtch.im:surface-tokens
cwtch.im:updateDrone
cwtch.im:thread_works
cwtch.im:file_sharing_fixes
cwtch.im:cbump
cwtch.im:emitVer
cwtch.im:cleanAndNoDupImport
cwtch.im:filesharing-persist
cwtch.im:mgroups
cwtch.im:tapir-gc
cwtch.im:winExport
cwtch.im:perf
cwtch.im:plugins
cwtch.im:healthTime
cwtch.im:parseScope
cwtch.im:send
cwtch.im:sendRetId
cwtch.im:nc
cwtch.im:import_export
cwtch.im:state
cwtch.im:profile_images
cwtch.im:fastercwtch
cwtch.im:tapir0.5
cwtch.im:sender_side_previews
cwtch.im:hash
cwtch.im:1.7conn
cwtch.im:1.6_conn
cwtch.im:fixAcceptBlock
cwtch.im:storage_engine_refactor
cwtch.im:publicname
soatok:master
soatok:message_flags
soatok:peer_fixes
soatok:groupwiring
soatok:servers
soatok:upgrade
soatok:indexedacks
soatok:blockunknown
soatok:cwtchpeer-split
soatok:newui-bugfix
soatok:group_create_ui
soatok:first_contact
soatok:cleanup
soatok:server_support
soatok:leave_server
soatok:gating
soatok:specify-events
soatok:torrc
soatok:tapir_server
soatok:peer_history
soatok:replace-extra25519
soatok:upgrade-tapir
soatok:windows
soatok:update-tapir
soatok:plugin
soatok:retry
soatok:autoblocking
soatok:deps
soatok:tapir-1.8
soatok:tapir-peer
soatok:testfix
soatok:ebf
soatok:ebf201903251154
soatok:postalpha
soatok:peersend
soatok:groupimportfix
soatok:ebf201902111339
soatok:groupinvitefix
soatok:group-map-fix
soatok:addcontactbugfix
soatok:storagebugfix
soatok:profilefix
soatok:ebf201902021718
soatok:ricochet1.0.1
soatok:ineffassign
soatok:ebf201901281158
soatok:update-libricochet
soatok:ebf201901221109
soatok:full_block
soatok:common_fields
soatok:event_times
soatok:ebf2019011512
soatok:update_group_checks
soatok:module
soatok:protocolengine
soatok:autoblock
soatok:eventmanager
soatok:sorting
soatok:mxlength
soatok:movelisten
soatok:merging
soatok:bigmerge
soatok:p2ptimeline
soatok:servercheck
soatok:group-attributes
soatok:storagerefactor
soatok:contact-level-attributes
soatok:handlers
soatok:bugfix
soatok:cwtchutil
soatok:waitfaster
soatok:nit
soatok:detports2
soatok:detports
soatok:constructed
soatok:thefuture
soatok:storage-refactor
soatok:peerdata
soatok:identity
soatok:export-fix
soatok:initial_message
soatok:configmap
soatok:profiles
soatok:server-check
soatok:clifix
soatok:bugfix-1
soatok:buildbot
soatok:drone
soatok:tor
soatok:profile-password
soatok:tor-manager
soatok:profile-password-2
soatok:integ_test_fix
soatok:export
soatok:blocking-thread-safe
cwtch.im:v0.27.0
cwtch.im:v0.26.3
cwtch.im:v0.26.2
cwtch.im:v0.26.1
cwtch.im:v0.26.0
cwtch.im:v0.25.1
cwtch.im:v0.25.0
cwtch.im:v0.24.5
cwtch.im:v0.24.4
cwtch.im:v0.24.3
cwtch.im:v0.24.2
cwtch.im:v0.24.1
cwtch.im:v0.24.0
cwtch.im:v0.23.1
cwtch.im:v0.23.0
cwtch.im:v0.22.2
cwtch.im:v0.22.1
cwtch.im:v0.22.0
cwtch.im:v0.21.0
cwtch.im:v0.20.8
cwtch.im:v0.20.7
cwtch.im:v0.20.6
cwtch.im:v0.20.5
cwtch.im:v0.20.4
cwtch.im:v0.20.3
cwtch.im:v0.20.2
cwtch.im:v0.20.1
cwtch.im:v0.20.0
cwtch.im:v0.19.7
cwtch.im:v0.19.6
cwtch.im:v0.19.5
cwtch.im:v0.19.4
cwtch.im:v0.19.3
cwtch.im:v0.19.2
cwtch.im:v0.19.1
cwtch.im:v0.19.0
cwtch.im:v0.18.10
cwtch.im:v0.18.9
cwtch.im:v0.18.8
cwtch.im:v0.18.7
cwtch.im:v0.18.6
cwtch.im:v0.18.5
cwtch.im:v0.18.4
cwtch.im:v0.18.3
cwtch.im:v0.18.2
cwtch.im:v0.18.1
cwtch.im:v0.18.0
cwtch.im:v0.17.3
cwtch.im:v0.17.2
cwtch.im:v0.17.1
cwtch.im:v0.17.0
cwtch.im:v0.16.8
cwtch.im:v0.16.7
cwtch.im:v0.16.6
cwtch.im:v0.16.5
cwtch.im:v0.16.4
cwtch.im:v0.16.3
cwtch.im:v0.16.2
cwtch.im:v0.16.1
cwtch.im:v0.16.0
cwtch.im:v0.15.2
cwtch.im:v0.15.1
cwtch.im:v0.15.0
cwtch.im:v0.14.19
cwtch.im:v0.14.18
cwtch.im:v0.14.17
cwtch.im:v0.14.16
cwtch.im:v0.14.15
cwtch.im:v0.14.14
cwtch.im:v0.14.13
cwtch.im:v0.14.12
cwtch.im:v0.14.11
cwtch.im:v0.14.10
cwtch.im:v0.14.9
cwtch.im:v0.14.8
cwtch.im:v0.14.7
cwtch.im:v0.14.6
cwtch.im:v0.14.5
cwtch.im:v0.14.4
cwtch.im:v0.14.3
cwtch.im:v0.14.2
cwtch.im:v0.14.1
cwtch.im:v0.14.0
cwtch.im:v0.13.3
cwtch.im:v0.13.2
cwtch.im:v0.13.1
cwtch.im:v0.13.0
cwtch.im:v0.12.2
cwtch.im:v0.12.1
cwtch.im:v0.12.0
cwtch.im:v0.11.2
cwtch.im:v0.11.1
cwtch.im:v0.11.0
cwtch.im:v0.10.0
cwtch.im:v0.9.2
cwtch.im:v0.9.1
cwtch.im:v0.9.0
cwtch.im:v0.8.12
cwtch.im:v0.8.11
cwtch.im:v0.8.10
cwtch.im:v0.8.9
cwtch.im:v0.8.8
cwtch.im:v0.8.7
cwtch.im:v0.8.6
cwtch.im:v0.8.5
cwtch.im:v0.8.4
cwtch.im:v0.8.3
cwtch.im:v0.8.2
cwtch.im:v0.8.1
cwtch.im:v0.8.0
cwtch.im:v0.7.6
cwtch.im:v0.7.5
cwtch.im:v0.7.4
cwtch.im:v0.7.3
cwtch.im:v0.7.2
cwtch.im:v0.7.1
cwtch.im:v0.7.0
cwtch.im:v0.6.10
cwtch.im:v0.6.9
cwtch.im:v0.6.8
cwtch.im:v0.6.7
cwtch.im:v0.6.6
cwtch.im:v0.6.5
cwtch.im:v0.6.4
cwtch.im:v0.6.3
cwtch.im:v0.6.2
cwtch.im:v0.6.1
cwtch.im:v0.6.0
cwtch.im:v0.5.1
cwtch.im:v0.5.0
cwtch.im:v0.4.11
cwtch.im:v0.4.10
cwtch.im:v0.4.9
cwtch.im:v0.4.8
cwtch.im:v0.4.7
cwtch.im:v0.4.6
cwtch.im:v0.4.5
cwtch.im:v0.4.4
cwtch.im:v0.4.3
cwtch.im:v0.4.2
cwtch.im:v0.4.1
cwtch.im:v0.4.0
cwtch.im:v0.3.16
cwtch.im:v0.3.15
cwtch.im:v0.3.14
cwtch.im:v0.3.13
cwtch.im:v0.3.12
cwtch.im:v0.3.11
cwtch.im:v0.3.10
cwtch.im:v0.3.9
cwtch.im:v0.3.8
cwtch.im:v0.3.7
cwtch.im:v0.3.6
cwtch.im:v0.3.5
cwtch.im:v0.3.4
cwtch.im:v0.3.3
cwtch.im:v0.3.2
cwtch.im:v0.3.1
cwtch.im:v0.3.0
cwtch.im:v0.2.1-pr-1
cwtch.im:v0.2.1-pr
cwtch.im:v0.2.0
cwtch.im:v0.2
pull from: soatok:ebf201903251154
soatok:master
soatok:message_flags
soatok:peer_fixes
soatok:groupwiring
soatok:servers
soatok:upgrade
soatok:indexedacks
soatok:blockunknown
soatok:cwtchpeer-split
soatok:newui-bugfix
soatok:group_create_ui
soatok:first_contact
soatok:cleanup
soatok:server_support
soatok:leave_server
soatok:gating
soatok:specify-events
soatok:torrc
soatok:tapir_server
soatok:peer_history
soatok:replace-extra25519
soatok:upgrade-tapir
soatok:windows
soatok:update-tapir
soatok:plugin
soatok:retry
soatok:autoblocking
soatok:deps
soatok:tapir-1.8
soatok:tapir-peer
soatok:testfix
soatok:ebf
soatok:ebf201903251154
soatok:postalpha
soatok:peersend
soatok:groupimportfix
soatok:ebf201902111339
soatok:groupinvitefix
soatok:group-map-fix
soatok:addcontactbugfix
soatok:storagebugfix
soatok:profilefix
soatok:ebf201902021718
soatok:ricochet1.0.1
soatok:ineffassign
soatok:ebf201901281158
soatok:update-libricochet
soatok:ebf201901221109
soatok:full_block
soatok:common_fields
soatok:event_times
soatok:ebf2019011512
soatok:update_group_checks
soatok:module
soatok:protocolengine
soatok:autoblock
soatok:eventmanager
soatok:sorting
soatok:mxlength
soatok:movelisten
soatok:merging
soatok:bigmerge
soatok:p2ptimeline
soatok:servercheck
soatok:group-attributes
soatok:storagerefactor
soatok:contact-level-attributes
soatok:handlers
soatok:bugfix
soatok:cwtchutil
soatok:waitfaster
soatok:nit
soatok:detports2
soatok:detports
soatok:constructed
soatok:thefuture
soatok:storage-refactor
soatok:peerdata
soatok:identity
soatok:export-fix
soatok:initial_message
soatok:configmap
soatok:profiles
soatok:server-check
soatok:clifix
soatok:bugfix-1
soatok:buildbot
soatok:drone
soatok:tor
soatok:profile-password
soatok:tor-manager
soatok:profile-password-2
soatok:integ_test_fix
soatok:export
soatok:blocking-thread-safe
cwtch.im:master
cwtch.im:managed-groups
cwtch.im:ep
cwtch.im:offline-messages
cwtch.im:acl-v2
cwtch.im:overlays
cwtch.im:android_file_download_fix
cwtch.im:hybridgroups
cwtch.im:enhanced-permissions
cwtch.im:settings
cwtch.im:post-stable-fixes
cwtch.im:fixups
cwtch.im:stable-blockers
cwtch.im:search
cwtch.im:crForceDisconn
cwtch.im:server-update
cwtch.im:conversation_search
cwtch.im:fixCR
cwtch.im:deletecontactfix
cwtch.im:startupbugs
cwtch.im:font-setting
cwtch.im:events
cwtch.im:handleStatus
cwtch.im:fuzzbot
cwtch.im:code-fixes
cwtch.im:fixpanic
cwtch.im:autodownload
cwtch.im:esi
cwtch.im:eventhooks
cwtch.im:autobindings
cwtch.im:contactRetryDisconn
cwtch.im:priority
cwtch.im:createProfileAttr
cwtch.im:serverAccept
cwtch.im:connectionLogic
cwtch.im:fixdeletep2
cwtch.im:cached_tokens
cwtch.im:indents_and_tools
cwtch.im:go_update
cwtch.im:protocl_engine_shutdown_fix
cwtch.im:timeout_fixes_tokens
cwtch.im:fixShutdown
cwtch.im:networkAfterOnline
cwtch.im:surface-tokens
cwtch.im:updateDrone
cwtch.im:thread_works
cwtch.im:file_sharing_fixes
cwtch.im:cbump
cwtch.im:emitVer
cwtch.im:cleanAndNoDupImport
cwtch.im:filesharing-persist
cwtch.im:mgroups
cwtch.im:tapir-gc
cwtch.im:winExport
cwtch.im:perf
cwtch.im:plugins
cwtch.im:healthTime
cwtch.im:parseScope
cwtch.im:send
cwtch.im:sendRetId
cwtch.im:nc
cwtch.im:import_export
cwtch.im:state
cwtch.im:profile_images
cwtch.im:fastercwtch
cwtch.im:tapir0.5
cwtch.im:sender_side_previews
cwtch.im:hash
cwtch.im:1.7conn
cwtch.im:1.6_conn
cwtch.im:fixAcceptBlock
cwtch.im:storage_engine_refactor
cwtch.im:publicname
cwtch.im:v0.27.0
cwtch.im:v0.26.3
cwtch.im:v0.26.2
cwtch.im:v0.26.1
cwtch.im:v0.26.0
cwtch.im:v0.25.1
cwtch.im:v0.25.0
cwtch.im:v0.24.5
cwtch.im:v0.24.4
cwtch.im:v0.24.3
cwtch.im:v0.24.2
cwtch.im:v0.24.1
cwtch.im:v0.24.0
cwtch.im:v0.23.1
cwtch.im:v0.23.0
cwtch.im:v0.22.2
cwtch.im:v0.22.1
cwtch.im:v0.22.0
cwtch.im:v0.21.0
cwtch.im:v0.20.8
cwtch.im:v0.20.7
cwtch.im:v0.20.6
cwtch.im:v0.20.5
cwtch.im:v0.20.4
cwtch.im:v0.20.3
cwtch.im:v0.20.2
cwtch.im:v0.20.1
cwtch.im:v0.20.0
cwtch.im:v0.19.7
cwtch.im:v0.19.6
cwtch.im:v0.19.5
cwtch.im:v0.19.4
cwtch.im:v0.19.3
cwtch.im:v0.19.2
cwtch.im:v0.19.1
cwtch.im:v0.19.0
cwtch.im:v0.18.10
cwtch.im:v0.18.9
cwtch.im:v0.18.8
cwtch.im:v0.18.7
cwtch.im:v0.18.6
cwtch.im:v0.18.5
cwtch.im:v0.18.4
cwtch.im:v0.18.3
cwtch.im:v0.18.2
cwtch.im:v0.18.1
cwtch.im:v0.18.0
cwtch.im:v0.17.3
cwtch.im:v0.17.2
cwtch.im:v0.17.1
cwtch.im:v0.17.0
cwtch.im:v0.16.8
cwtch.im:v0.16.7
cwtch.im:v0.16.6
cwtch.im:v0.16.5
cwtch.im:v0.16.4
cwtch.im:v0.16.3
cwtch.im:v0.16.2
cwtch.im:v0.16.1
cwtch.im:v0.16.0
cwtch.im:v0.15.2
cwtch.im:v0.15.1
cwtch.im:v0.15.0
cwtch.im:v0.14.19
cwtch.im:v0.14.18
cwtch.im:v0.14.17
cwtch.im:v0.14.16
cwtch.im:v0.14.15
cwtch.im:v0.14.14
cwtch.im:v0.14.13
cwtch.im:v0.14.12
cwtch.im:v0.14.11
cwtch.im:v0.14.10
cwtch.im:v0.14.9
cwtch.im:v0.14.8
cwtch.im:v0.14.7
cwtch.im:v0.14.6
cwtch.im:v0.14.5
cwtch.im:v0.14.4
cwtch.im:v0.14.3
cwtch.im:v0.14.2
cwtch.im:v0.14.1
cwtch.im:v0.14.0
cwtch.im:v0.13.3
cwtch.im:v0.13.2
cwtch.im:v0.13.1
cwtch.im:v0.13.0
cwtch.im:v0.12.2
cwtch.im:v0.12.1
cwtch.im:v0.12.0
cwtch.im:v0.11.2
cwtch.im:v0.11.1
cwtch.im:v0.11.0
cwtch.im:v0.10.0
cwtch.im:v0.9.2
cwtch.im:v0.9.1
cwtch.im:v0.9.0
cwtch.im:v0.8.12
cwtch.im:v0.8.11
cwtch.im:v0.8.10
cwtch.im:v0.8.9
cwtch.im:v0.8.8
cwtch.im:v0.8.7
cwtch.im:v0.8.6
cwtch.im:v0.8.5
cwtch.im:v0.8.4
cwtch.im:v0.8.3
cwtch.im:v0.8.2
cwtch.im:v0.8.1
cwtch.im:v0.8.0
cwtch.im:v0.7.6
cwtch.im:v0.7.5
cwtch.im:v0.7.4
cwtch.im:v0.7.3
cwtch.im:v0.7.2
cwtch.im:v0.7.1
cwtch.im:v0.7.0
cwtch.im:v0.6.10
cwtch.im:v0.6.9
cwtch.im:v0.6.8
cwtch.im:v0.6.7
cwtch.im:v0.6.6
cwtch.im:v0.6.5
cwtch.im:v0.6.4
cwtch.im:v0.6.3
cwtch.im:v0.6.2
cwtch.im:v0.6.1
cwtch.im:v0.6.0
cwtch.im:v0.5.1
cwtch.im:v0.5.0
cwtch.im:v0.4.11
cwtch.im:v0.4.10
cwtch.im:v0.4.9
cwtch.im:v0.4.8
cwtch.im:v0.4.7
cwtch.im:v0.4.6
cwtch.im:v0.4.5
cwtch.im:v0.4.4
cwtch.im:v0.4.3
cwtch.im:v0.4.2
cwtch.im:v0.4.1
cwtch.im:v0.4.0
cwtch.im:v0.3.16
cwtch.im:v0.3.15
cwtch.im:v0.3.14
cwtch.im:v0.3.13
cwtch.im:v0.3.12
cwtch.im:v0.3.11
cwtch.im:v0.3.10
cwtch.im:v0.3.9
cwtch.im:v0.3.8
cwtch.im:v0.3.7
cwtch.im:v0.3.6
cwtch.im:v0.3.5
cwtch.im:v0.3.4
cwtch.im:v0.3.3
cwtch.im:v0.3.2
cwtch.im:v0.3.1
cwtch.im:v0.3.0
cwtch.im:v0.2.1-pr-1
cwtch.im:v0.2.1-pr
cwtch.im:v0.2.0
cwtch.im:v0.2
These branches are equal. There is no need to create a pull request.