Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

jami-project
- Activity
- Members
- Labels
- Releases
- Model registry
- Incidents

Snippets Groups Projects

This project is archived. Its data is read-only.

savoirfairelinux
jami-project
Commits
ca64899d

Unverified Commit ca64899d authored Aug 25, 2020 by Sébastien Blin

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into nightly

Change-Id: Ic70d304952c40360715dd3155f4fdd1450437656

parents b802cbca da29895a

No related branches found

No related tags found

No related merge requests found

Changes 14

Show whitespace changes

Inline Side-by-side

Showing

.dockerignore 3 additions, 1 deletion

.dockerignore
.gitignore 3 additions, 0 deletions

.gitignore
.gitmodules 6 additions, 3 deletions

.gitmodules
client-qt 1 addition, 0 deletions

client-qt
client-windows 0 additions, 1 deletion

client-windows
jami-plugins 1 addition, 0 deletions

jami-plugins
make-ring.py 87 additions, 25 deletions

make-ring.py
packaging/rules/debian-one-click-install/copyright 1 addition, 1 deletion

packaging/rules/debian-one-click-install/copyright
packaging/rules/debian/copyright 1 addition, 1 deletion

packaging/rules/debian/copyright
scripts/build-windows.py 16 additions, 27 deletions

scripts/build-windows.py
scripts/format.sh 86 additions, 0 deletions

scripts/format.sh
scripts/install-deps-windows.ps1 220 additions, 0 deletions

scripts/install-deps-windows.ps1
scripts/install.sh 44 additions, 14 deletions

scripts/install.sh
scripts/update-submodules.sh 8 additions, 1 deletion

scripts/update-submodules.sh

with 477 additions and 74 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please sign in to comment