Skip to content

Commit

Permalink
Merge pull request #67 from csett86/ffmuc-release-2023-1-1
Browse files Browse the repository at this point in the history
Merge upstream release v2023.1.1
  • Loading branch information
GoliathLabs authored Jan 20, 2023
2 parents 4732720 + 465c6fc commit a31ed18
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
npm ci
npm run lint
npm run dist
- uses: actions/upload-artifact@v3
with:
Expand Down Expand Up @@ -57,7 +58,6 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
npm ci
npm run lint
npm run dist
- uses: actions/upload-artifact@v3
with:
Expand Down
7 changes: 1 addition & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@ Download our latest release and you're off to the races!
| Windows | macOS | GNU/Linux (64-bit only) |
| -- | -- | -- |
| [Download](https://github.com/freifunkMUC/jitsi-meet-electron/releases/latest/download/ffmuc-meet.exe) | [Download](https://github.com/freifunkMUC/jitsi-meet-electron/releases/latest/download/ffmuc-meet.dmg) | [Download](https://github.com/freifunkMUC/jitsi-meet-electron/releases/latest/download/ffmuc-meet-x86_64.AppImage) |
### Third-Party builds

[<img src="https://flathub.org/assets/badges/flathub-badge-en.svg"
alt="Download On Flathub"
height="60">](https://flathub.org/apps/details/org.jitsi.jitsi-meet)

### Homebrew

Expand Down Expand Up @@ -163,7 +158,7 @@ Under wayland, experimental native wayland support can be enabled with the comma
./jitsi-meet-x86_64.AppImage --ozone-platform-hint=auto
```

Note that screensharing is currently not supported under wayland, eg. the permissions prompt may loop endlessly.
Note that screen-sharing is currently not supported under wayland, eg. the permissions prompt may loop endlessly.

In case you experience a blank page after jitsi server upgrades, try removing the local cache files:

Expand Down
4 changes: 2 additions & 2 deletions app/features/conference/external_api.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ffmuc-meet",
"version": "2023.1.0",
"version": "2023.1.1",
"description": "Electron application for Freifunk Meet",
"main": "./build/main.js",
"productName": "FreifunkMeet",
Expand Down

0 comments on commit a31ed18

Please sign in to comment.