GitHub-Mirror/riotX-android
1
0
Fork 1
mirror of https://github.com/vector-im/riotX-android synced 2025-10-06 00:02:48 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into upstream-merge2

Browse Source
This commit is contained in:
Damir Jelić
2021-11-17 15:35:07 +01:00
parent 50cdbaf041 31837390bc
commit ae635e2b0a
1878 changed files with 42377 additions and 16477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -8,6 +8,7 @@
.idea/*.xml
.DS_Store
/build
/benchmark-out
/captures
.externalNativeBuild
rust-sdk/target/*
@@ -18,4 +19,4 @@ Cargo.lock
/fastlane/private
/fastlane/report.xml
ktlint
/library/build