merge changes from the main fork #1

Merged

mvaneerde merged 15 commits from cwtch.im/cwtch-ui:trunk into trunk

mvaneerde commented

Owner

There is no content yet.

mvaneerde added 15 commits

f09c40d7dd Bandaid fix - update the Tor tarball to fetch for Windows builds to a more recent version

7d15c41aed Pull the old version from the Cwtch archive rather than the new version from Tor directly

61d1a60b0e nicer compose bar

1a80b4b808 Add Physics to Message Row. Fixes: #132

42ed710fc9 Merge pull request 'Bandaid fix - update the Tor tarball to fetch for Windows builds to a more recent version' (#149 ) from mvaneerde/cwtch-ui:windows-tor-ball into trunk

Reviewed-on: cwtch.im/cwtch-ui#149

afe2457062 Merge branch 'trunk' into animate

004e211d0b Merge pull request 'Add Physics to Message Row. Fixes: #132' (#151 ) from animate into trunk

Reviewed-on: cwtch.im/cwtch-ui#151
Reviewed-by: erinn <erinn@openprivacy.ca>

76c6a5f069 merge trunk

e487d0bd65 Merge branch 'trunk' into erinn45

67ed282394 Merge pull request 'clean up compose bar' (#152 ) from erinn45 into trunk

Reviewed-on: cwtch.im/cwtch-ui#152
Reviewed-by: Sarah Jamie Lewis <sarah@openprivacy.ca>

62a9402357 l10n updates

a06815fa08 Merge pull request 'l10n updates' (#153 ) from l10nupdates into trunk

Reviewed-on: cwtch.im/cwtch-ui#153

825fb23992 Block Unknown Connections Indicator

6210a64315 Format

397971a181 Merge pull request 'Block Unknown Connections Indicator' (#154 ) from blockunknown into trunk

Reviewed-on: cwtch.im/cwtch-ui#154
Reviewed-by: erinn <erinn@openprivacy.ca>

mvaneerde merged commit 56ed1be5db into trunk 2 years ago

mvaneerde referenced this issue from a commit

Merge pull request 'merge changes from the main fork' (#1) from cwtch.im/cwtch-ui:trunk into trunk

The pull request has been merged as 56ed1be5db.

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: mvaneerde/cwtch-ui#1