Benoit Marty
75071cf1d9
Cleanup
2020-12-09 13:50:14 +01:00
Benoit Marty
0956baecf9
Delete unencrypted files each time the app is started
2020-12-09 12:27:37 +01:00
Benoit Marty
ca7796114c
DefaultFileService: better management of the files and the filenames
2020-12-09 10:50:21 +01:00
aqulu
ed822becc6
Fix try-catch behavior of sendStateEvent actions
...
Signed-off-by: aqulu <dev@aqu.lu>
2020-12-09 08:39:00 +09:00
Benoit Marty
7057b2970b
Improve FileService API: add facility methods to deal with MessageWithAttachment object
2020-12-08 19:31:29 +01:00
Benoit Marty
42ab7f1b4f
Add space between image and text
...
And remove useless `apply` block
2020-12-08 17:42:42 +01:00
Benoit Marty
8e11ba21ed
Glide: No Disk cache for encrypted images
2020-12-08 17:37:24 +01:00
Benoit Marty
24a9ddaa5e
FileService: remove useless FileService.DownloadMode
2020-12-08 17:25:37 +01:00
Kaede
2d9043fbed
Translated using Weblate (Japanese)
...
Currently translated at 50.1% (996 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
2020-12-08 15:50:10 +00:00
random
682dff9c1c
Translated using Weblate (Italian)
...
Currently translated at 100.0% (1986 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
2020-12-08 15:50:09 +00:00
Jeanne Lavoie
9339b7e31d
Translated using Weblate (French)
...
Currently translated at 100.0% (1986 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
2020-12-08 15:50:09 +00:00
OLIVIER Thomas
7667ef686d
Translated using Weblate (French)
...
Currently translated at 100.0% (1986 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
2020-12-08 15:50:07 +00:00
Uumas
4d4fe687ac
Translated using Weblate (Finnish)
...
Currently translated at 79.9% (1587 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fi/
2020-12-08 15:50:07 +00:00
aqulu
c889deaab1
Remove unused imports
...
Signed-off-by: aqulu <dev@aqu.lu>
2020-12-08 22:25:28 +09:00
aqulu
c7efd1feb9
Convert StateService to suspend functions
...
Signed-off-by: aqulu <dev@aqu.lu>
2020-12-08 19:21:10 +09:00
Benoit Marty
7869d731d4
Fix the rotate screen issue
2020-12-07 10:38:34 +01:00
Benoit Marty
c603ec0b38
Format files
2020-12-07 09:55:11 +01:00
random
19524eaa82
Translated using Weblate (Italian)
...
Currently translated at 100.0% (1986 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
2020-12-06 14:50:08 +00:00
Hivaa
9bbae825e2
Translated using Weblate (Persian)
...
Currently translated at 100.0% (1986 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
2020-12-06 14:50:05 +00:00
Nikita Epifanov
dacb9cd86c
Translated using Weblate (Russian)
...
Currently translated at 99.8% (1983 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
2020-12-04 17:50:05 +00:00
Hivaa
b9d7333998
Translated using Weblate (Persian)
...
Currently translated at 100.0% (1986 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
2020-12-04 17:50:04 +00:00
@a2sc:matrix.org
e14b507b27
Translated using Weblate (German)
...
Currently translated at 97.3% (1933 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
2020-12-04 17:50:04 +00:00
Benoit Marty
431ac5aa2d
Fix layout issue
2020-12-04 15:23:59 +01:00
Benoit Marty
78fe7e5c16
No need to create a Set to remove an item from it
2020-12-04 14:56:26 +01:00
Benoit Marty
c2c9e37a36
PreviewUrl: fix layout issue and add more tests
2020-12-04 14:36:11 +01:00
Benoit Marty
5d3682cd44
More cleanup
2020-12-04 14:19:36 +01:00
Benoit Marty
2a19726e49
Cleanup and changelog
2020-12-04 14:19:24 +01:00
Benoit Marty
c08c652080
PreviewUrl: handle close (in memory)
2020-12-04 12:41:26 +01:00
Benoit Marty
9089c54990
Ripple effect
2020-12-04 11:53:37 +01:00
Benoit Marty
679d9bae1c
Fix bad image rendering
2020-12-04 11:45:05 +01:00
Benoit Marty
19315fc65e
PreviewUrl: handle click
2020-12-04 11:08:06 +01:00
Benoit Marty
770041eceb
PreviewUrl: setting and e2e room
2020-12-04 09:48:48 +01:00
Benoit Marty
fa7b0a24a7
PreviewUrl: Application part - bugfix
2020-12-04 08:01:00 +01:00
Benoit Marty
48354c7793
PreviewUrl: Application part - WIP
2020-12-04 07:46:09 +01:00
Benoit Marty
fcd9fe7d5a
PreviewUrl: layout for a single PreviewUrl
2020-12-03 19:32:49 +01:00
LinAGKar
5faaabf2f4
Translated using Weblate (Swedish)
...
Currently translated at 97.3% (1933 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
2020-12-03 14:50:05 +00:00
Keij0
1933fc948c
Translated using Weblate (Polish)
...
Currently translated at 76.8% (1526 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
2020-12-03 14:50:04 +00:00
quidje
83df430d17
Translated using Weblate (Dutch)
...
Currently translated at 55.6% (1106 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
2020-12-03 14:50:04 +00:00
Hivaa
ec60d7d0b6
Translated using Weblate (Persian)
...
Currently translated at 100.0% (1986 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
2020-12-03 14:50:04 +00:00
Benoit Marty
f9ccb0e8de
Translated using Weblate (Spanish)
...
Currently translated at 97.2% (1932 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es/
2020-12-03 14:50:04 +00:00
Onuray Sahin
a6724b5f75
EventTypeFilter implementation to allow hiding member events.
2020-12-03 16:10:50 +03:00
Hivaa
e5cbf9e3a3
Translated using Weblate (Persian)
...
Currently translated at 100.0% (1986 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
2020-12-03 11:10:27 +00:00
Benoit Marty
d889598b20
Fix DefaultLocale lint issue
2020-12-02 17:04:54 +01:00
Benoit Marty
c4577f28b2
Remove unnecessary dependency (we have -ktx dependency)
2020-12-02 16:43:52 +01:00
Benoit Marty
f5af15454e
Create a generic class for ViewModel
2020-12-02 15:47:21 +01:00
Benoit Marty
ee96d5c68f
Remove useless Factories
2020-12-02 15:41:31 +01:00
Benoit Marty
6c56b5f45b
Fix warnings after library upgrade
2020-12-02 14:39:33 +01:00
Benoit Marty
1058bfecf4
Kotlinification
2020-12-02 13:54:59 +01:00
Benoit Marty
f0afd5ceea
Update deprecated code
2020-12-02 13:49:07 +01:00
Benoit Marty
9881c9f61c
Fix compilation issue after library upgrade
2020-12-02 13:34:34 +01:00
Benoit Marty
89a7ec6d4b
Use fragment-ktx and preference-ktx dependencies (fix lint issue KtxExtensionAvailable)
2020-12-02 12:46:15 +01:00
Benoit Marty
42bc4d2445
Upgrade some dependencies and Kotlin version
2020-12-02 12:09:56 +01:00
Benoit Marty
2cc5d46cd3
Merge pull request #2474 from vector-im/feature/bma/remove_status_theme
...
Remove Status theme
2020-12-02 11:43:23 +01:00
Benoit Marty
3feb67ad32
Merge pull request #2470 from vector-im/feature/ons/fix_text_input_cursor
...
Move cursor to the end to fix the jumping cursor bug.
2020-12-02 11:23:53 +01:00
Benoit Marty
aa6c7afbbd
Remove Status theme and handle migration or current status theme to light theme ( #2424 )
2020-12-01 16:20:11 +01:00
Benoit Marty
c6ba296028
Create an extension to apply the fix at several places
2020-12-01 14:50:13 +01:00
Jeff Huang
3b21400bb8
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (1986 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
2020-12-01 12:50:15 +00:00
sr093906
1c3a279b8a
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 96.7% (1921 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
2020-12-01 12:50:12 +00:00
HolgerHuo
6236b01189
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 96.7% (1921 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
2020-12-01 12:50:12 +00:00
Nikita Epifanov
e42906f08a
Translated using Weblate (Russian)
...
Currently translated at 99.3% (1973 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
2020-12-01 12:50:11 +00:00
Kaede
b53ba2b98e
Translated using Weblate (Japanese)
...
Currently translated at 49.8% (991 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
2020-12-01 12:50:09 +00:00
Danial Behzadi
7bd8d54d5c
Translated using Weblate (Persian)
...
Currently translated at 99.4% (1976 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
2020-12-01 12:50:07 +00:00
Benoit Marty
b78f1dbb93
Hide the icon area if there is no icon to display
2020-11-30 17:52:16 +01:00
Benoit Marty
056b9df65e
Add title to the new two bottom sheets
2020-11-30 17:52:16 +01:00
Benoit Marty
589c301606
Fix bad copyright
2020-11-30 17:52:16 +01:00
Benoit Marty
476f721f5e
Cleanup
2020-11-30 17:52:16 +01:00
Benoit Marty
a813610c04
Room setting: update join rules and guest access ( #2442 )
2020-11-30 17:52:16 +01:00
Benoit Marty
41dd67f1c1
Renaming
2020-11-30 17:47:54 +01:00
Benoit Marty
63b068f426
Reorder iso Element Web
2020-11-30 17:46:14 +01:00
Benoit Marty
637c54073a
Room history visibility: Use correct wording for the setting.
2020-11-30 17:46:14 +01:00
Benoit Marty
4171311095
Room history visibility: from ugly dialog to nice bottom sheet.
...
Including a reusable bottom sheet pattern, for future join rules setting bottom sheet
2020-11-30 17:46:14 +01:00
Benoit Marty
bb5d5ffc92
Improve room history visibility setting UX ( #1579 )
...
And observe correctly the state event
2020-11-30 17:43:28 +01:00
Benoit Marty
d07a95204b
Better name
2020-11-30 17:41:55 +01:00
Onuray Sahin
2736247d09
Move cursor to the end to fix the jumping cursor bug.
...
Fixes #2469
2020-11-30 18:12:26 +03:00
Benoit Marty
93ffb116b7
Merge pull request #2439 from vector-im/feature/bma/alias
...
Add room alias management
2020-11-30 14:59:21 +01:00
Benoit Marty
096abd7ebf
Fix IllegalStateException: focus search returned a view that wasn't able to take focus!
...
And no multiline input for room alias
2020-11-30 13:33:41 +01:00
Onuray Sahin
694397efc1
Create a new pin mode for changing pin code.
2020-11-30 13:51:40 +03:00
Onuray Sahin
ffe9a03d3e
Merge branch 'develop' into feature/ons/change_pin
...
* develop:
Format source
Fix / double bottomsheet effect
Version**
Ensure the Activity is destroyed, it seems that the intent flags are not enough now. - finish all
Ensure the Activity is destroyed, it seems that the intent flags are not enough now.
Remove redundant returns
Prepare version 1.0.11
Fix issue when there is no display name
Cleanup
Fix issue with too big icons
Use style instead of duplicating the whole layout file
Try other asset strategy as lint not happy
Convert TermsService to suspend functions
Convert UploadsService to suspend functions
Convert IntegrationManagerService to suspend functions
update change log
Home empty screen design update
2020-11-30 13:14:13 +03:00
Benoit Marty
c029564590
Rename method and class for more clarity
2020-11-30 10:59:07 +01:00
Benoit Marty
0cfea40b24
Use when statement and modify the case to simplify the code
2020-11-30 10:59:07 +01:00
Benoit Marty
9c53f0f881
Clarify aliasLocalPart
2020-11-30 10:59:07 +01:00
Benoit Marty
50ddd3cf31
Small cleanup, handle case of no local alias, handle unpublish of canonical alias
2020-11-30 10:59:07 +01:00
Benoit Marty
6c7eb6ea8c
Small wording change
2020-11-30 10:59:07 +01:00
Benoit Marty
0da0857970
Cleanup
2020-11-30 10:59:07 +01:00
Benoit Marty
90e0006cae
Room directory visibility management
2020-11-30 10:59:07 +01:00
Benoit Marty
a570528f6c
More fixes
2020-11-30 10:59:07 +01:00
Benoit Marty
2d4cbde72c
Render canonical alias
2020-11-30 10:59:07 +01:00
Benoit Marty
f5ae95d7f1
Close form only if necessary
2020-11-30 10:59:07 +01:00
Benoit Marty
c5e6e004dd
Room alias detail
2020-11-30 10:59:07 +01:00
Benoit Marty
d9c209aa87
Cleanup
2020-11-30 10:59:07 +01:00
Benoit Marty
8f80f375f0
Prepare alias bottom sheet
2020-11-30 10:59:07 +01:00
Benoit Marty
2cf2233643
Naming convention
2020-11-30 10:59:07 +01:00
Benoit Marty
36564f0c75
copy/paste error
2020-11-30 10:59:07 +01:00
Benoit Marty
8dbb984ead
Sort the aliases
2020-11-30 10:59:07 +01:00
Benoit Marty
74ffbd4679
Ensure the forms are displayable
2020-11-30 10:59:07 +01:00
Benoit Marty
0a9b234272
Renaming
2020-11-30 10:59:07 +01:00
Benoit Marty
3a06ef3959
Improve form UX + local echo in case of success
2020-11-30 10:59:07 +01:00
Benoit Marty
ed4676bb6c
Cleanup and avoid duplicate
2020-11-30 10:59:07 +01:00
Benoit Marty
893ebd9690
Fix UI error
2020-11-30 10:59:07 +01:00
Benoit Marty
3c069f8b79
Add published aliases
2020-11-30 10:59:07 +01:00
Benoit Marty
93580c902f
Prepare to update canonical alias state
2020-11-30 10:59:07 +01:00
Benoit Marty
e1abd5a051
Fix layout issue
2020-11-30 10:59:07 +01:00
Benoit Marty
27fc5f265f
Add/Remove local alias ( #2428 )
2020-11-30 10:59:07 +01:00
Benoit Marty
5b618ba1f3
Create RoomDirectoryAPI, and handle deletion of alias
2020-11-30 10:59:07 +01:00
Benoit Marty
a6f56ace24
Create a dedicated screen to manage room alias ( #2428 ) - WIP
2020-11-30 10:59:07 +01:00
Benoit Marty
0d93105bcd
Rended m.room.canonical_alias event in the timeline, considering alt_aliases ( #2428 )
2020-11-30 10:59:07 +01:00
Benoit Marty
e2a89c22da
Do not show m.room.aliases event in the timeline ( #2428 )
2020-11-30 10:59:07 +01:00
Benoit Marty
d759636d95
Merge pull request #2465 from vector-im/feature/bca/fix_verifypassphrase_bottomsheet
...
Fix / double bottomsheet effect
2020-11-30 10:58:15 +01:00
Benoit Marty
c8a8e0f2da
Format source
2020-11-30 10:54:22 +01:00
Benoit Marty
b004dfbdf2
Merge pull request #2457 from Dominaezzz/suspend_functions_2
...
Convert IntegrationManagerService to suspend functions
2020-11-30 10:49:46 +01:00
Benoit Marty
40ea91cce4
Merge pull request #2459 from Dominaezzz/suspend_functions_3
...
Convert UploadsService to suspend functions
2020-11-30 10:48:44 +01:00
Benoit Marty
abcb02d4aa
Merge pull request #2460 from Dominaezzz/suspend_functions
...
Convert TermsService to suspend functions
2020-11-30 10:47:55 +01:00
Besnik Bleta
a5079f5243
Translated using Weblate (Albanian)
...
Currently translated at 99.3% (1973 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
2020-11-28 17:50:17 +00:00
krikra01
422c681e55
Translated using Weblate (Russian)
...
Currently translated at 97.1% (1930 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
2020-11-28 17:50:14 +00:00
Marcelo Filho
9531a38486
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (1986 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
2020-11-28 17:50:13 +00:00
sblondon
493cd2a0e3
Translated using Weblate (French)
...
Currently translated at 98.8% (1963 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
2020-11-28 17:50:10 +00:00
Priit Jõerüüt
f7f7e808f2
Translated using Weblate (Estonian)
...
Currently translated at 100.0% (1986 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
2020-11-28 17:50:08 +00:00
zeritti
217c88f342
Translated using Weblate (Czech)
...
Currently translated at 100.0% (1986 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
2020-11-28 17:50:05 +00:00
Valere
cf70916764
Fix / double bottomsheet effect
2020-11-28 00:41:29 +01:00
Benoit Marty
b84d7f0834
Version**
2020-11-27 20:42:02 +01:00
Benoit Marty
7b969ebd74
Ensure the Activity is destroyed, it seems that the intent flags are not enough now. - finish all
2020-11-27 16:00:30 +01:00
Onuray Sahin
245aa6e9e7
Create a new pin when tap on change pin item.
2020-11-27 17:17:24 +03:00
Benoit Marty
163f4cfaf2
Ensure the Activity is destroyed, it seems that the intent flags are not enough now.
2020-11-27 15:15:56 +01:00
Benoit Marty
e3ca89a81b
Fix issue when there is no display name
2020-11-27 13:54:21 +01:00
Benoit Marty
8696650f20
Cleanup
2020-11-27 13:53:19 +01:00
Onuray Sahin
89e7e28bfa
Add settings item to change pin.
2020-11-27 15:22:31 +03:00
Benoit Marty
32d42794dd
Merge branch 'develop' into feature/bca/home_empty_screens
2020-11-27 12:02:30 +01:00
Benoit Marty
14c71d6c07
Fix issue with too big icons
2020-11-27 12:01:19 +01:00
Benoit Marty
cce4d7d4d9
Use style instead of duplicating the whole layout file
2020-11-27 11:09:13 +01:00
Benoit Marty
bc889cbcf4
Merge pull request #2444 from vector-im/feature/bca/deeplink_mxto
...
Fix issues with matrix.to deep linking
2020-11-27 10:22:51 +01:00
Valere
7c9b943733
Try other asset strategy as lint not happy
2020-11-27 09:58:14 +01:00
Weblate
d80927a8f9
Merge branch 'origin/develop' into Weblate.
2020-11-27 07:37:32 +00:00
Dominic Fischer
27050b911b
Convert TermsService to suspend functions
...
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2020-11-26 21:53:22 +00:00
Dominic Fischer
a3a2c0a9a8
Convert UploadsService to suspend functions
...
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2020-11-26 21:51:58 +00:00
Dominic Fischer
92ceb0e8fb
Convert IntegrationManagerService to suspend functions
...
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
2020-11-26 21:17:58 +00:00
Valere
835a36986d
Refactoring following review
2020-11-26 17:39:00 +01:00
Valere
67057bfac4
Merge pull request #2417 from vector-im/feature/bca/quick_invite_dm_tab
...
Feature/bca/quick invite dm tab
2020-11-26 14:58:14 +01:00
Valere
fa191136cc
Home empty screen design update
2020-11-26 13:27:10 +01:00
Daniel Løvbrøtte Olsen
15d93c8aeb
Translated using Weblate (Norwegian Bokmål)
...
Currently translated at 43.3% (837 of 1933 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
2020-11-26 11:50:02 +00:00
Valere
4f5632b916
code review
2020-11-26 09:09:27 +01:00
Valere
8e6e6736a3
Code review
2020-11-26 09:09:27 +01:00
Valere
804afc9a1d
Fix issues with matrix.to deep linking
2020-11-26 09:09:27 +01:00
Valere
bcd86977d2
Fix test + lint
2020-11-25 17:17:48 +01:00
Valere
a8b5a5227f
Code review update
2020-11-25 15:47:27 +01:00
Daniel Løvbrøtte Olsen
0e908ad882
Translated using Weblate (Norwegian Bokmål)
...
Currently translated at 43.1% (834 of 1933 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
2020-11-25 08:50:02 +00:00
Ed Geraghty
bc6debea89
Disable native dialler integration on jitsi widget
...
Native dialler integration breaks the jitsi widget for those of us with non-vanilla telephony frameworks.
Disabling this integration (as is default on the Jitsi Meet Android app) allows us to also join conference calls, with no adverse effect on those for whom it already works.
Signed-off-by: Ed Geraghty <ed@geraghty.london>
2020-11-22 23:13:01 +00:00
keraint
d5523b18b9
Translated using Weblate (French)
...
Currently translated at 100.0% (1933 of 1933 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
2020-11-21 08:49:59 +00:00
Valere
d9757cc660
Fix lint
2020-11-20 16:23:04 +01:00
Valere
1cb3522e73
Fix string
2020-11-20 15:46:21 +01:00
Valere
7583b0a358
Fix rebase
2020-11-20 15:17:35 +01:00