mirror of
https://github.com/laurent22/joplin.git
synced 2024-11-27 08:21:03 +02:00
Merge branch 'dev' into release-2.6
This commit is contained in:
commit
7c3cf8ce84
@ -146,8 +146,8 @@ android {
|
||||
applicationId "net.cozic.joplin"
|
||||
minSdkVersion rootProject.ext.minSdkVersion
|
||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||
versionCode 2097663
|
||||
versionName "2.6.7"
|
||||
versionCode 2097664
|
||||
versionName "2.6.8"
|
||||
ndk {
|
||||
abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
# Joplin Android app changelog
|
||||
|
||||
## [android-v2.6.7](https://github.com/laurent22/joplin/releases/tag/android-v2.6.7) - 2021-12-16T09:48:05Z
|
||||
## [android-v2.6.8](https://github.com/laurent22/joplin/releases/tag/android-v2.6.8) - 2021-12-17T10:15:00Z
|
||||
|
||||
- Improved: Update Mermaid: 8.12.1 -> 8.13.5 (#5831 by Helmut K. C. Tessarek)
|
||||
- Fixed: Links in flowchart Mermaid diagrams (#5830) (#5801 by Helmut K. C. Tessarek)
|
||||
|
Loading…
Reference in New Issue
Block a user