mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2024-11-17 07:14:54 +00:00
Code Issues Releases Wiki Activity
5,119 Commits 8 Branches 134 Tags 134 MiB
8a992d4c47
Commit Graph

4618 Commits

Author SHA1 Message Date
Enol P
3e7ff96445
Translated using Weblate (Asturian) 
Currently translated at 40.6% (194 of 478 strings)
 2019-10-25 21:29:55 +02:00
Hosted Weblate
558e3b1032
Merge branch 'origin/dev' into Weblate. 2019-10-22 03:31:44 +02:00
Allan Nordhøy
65279b3364
Translated using Weblate (Norwegian Bokmål) 
Currently translated at 95.0% (454 of 478 strings)
 2019-10-22 03:31:42 +02:00
Muhammad Sharjeel
d3ca184570
Translated using Weblate (Urdu) 
Currently translated at 100.0% (478 of 478 strings)
 2019-10-22 03:31:42 +02:00
01QueN10
40a2322e09
Translated using Weblate (Korean) 
Currently translated at 99.0% (473 of 478 strings)
 2019-10-22 03:31:08 +02:00
Mattias Münster
0b593b343e
Translated using Weblate (Swedish) 
Currently translated at 79.7% (381 of 478 strings)
 2019-10-22 03:31:06 +02:00
ozyc
83dc62239f
Translated using Weblate (French) 
Currently translated at 100.0% (478 of 478 strings)
 2019-10-22 03:31:05 +02:00
Igor Nedoboy
34cb44f2be
Translated using Weblate (Russian) 
Currently translated at 100.0% (478 of 478 strings)
 2019-10-22 03:31:04 +02:00
ozyc
55a82b631e
Translated using Weblate (Esperanto) 
Currently translated at 58.4% (279 of 478 strings)
 2019-10-22 03:31:03 +02:00
Redirion
babd5336a0
Bump ExoPlayer to 2.10.6 and OkHttp to 3.12.6 
Little dependency update.
ExoPlayer Changelog: https://github.com/google/ExoPlayer/blob/release-v2/RELEASENOTES.md
OkHttp Changelog: https://square.github.io/okhttp/changelog_3x/#version-3126
 2019-10-19 05:58:48 +02:00
Igor Nedoboy
b358231b20
Translated using Weblate (Russian) 
Currently translated at 100.0% (478 of 478 strings)
 2019-10-19 00:23:12 +02:00
Igor Nedoboy
4579fa52ac
Translated using Weblate (Russian) 
Currently translated at 100.0% (478 of 478 strings)
 2019-10-19 00:11:46 +02:00
Igor Nedoboy
b4449e4998
Translated using Weblate (Russian) 
Currently translated at 100.0% (478 of 478 strings)
 2019-10-19 00:07:21 +02:00
Goudarz Jafari
d5b1dceb66
Translated using Weblate (Persian) 
Currently translated at 98.5% (471 of 478 strings)
 2019-10-18 20:52:50 +02:00
朱程宇
95f44cbe9a
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 1.7% (8 of 478 strings)
 2019-10-16 05:20:38 +02:00
Jeff Huang
8849ddab81
Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (478 of 478 strings)
 2019-10-16 05:20:35 +02:00
Nathan
9a47714645
Translated using Weblate (French) 
Currently translated at 100.0% (478 of 478 strings)
 2019-10-16 05:20:34 +02:00
zmni
b1396b98a3
Translated using Weblate (Indonesian) 
Currently translated at 100.0% (478 of 478 strings)
 2019-10-16 05:20:33 +02:00
WaldiS
c3433baf0c
Translated using Weblate (Polish) 
Currently translated at 99.8% (477 of 478 strings)
 2019-10-16 05:20:32 +02:00
zeritti
fab692c386
Translated using Weblate (Czech) 
Currently translated at 100.0% (478 of 478 strings)
 2019-10-16 05:20:32 +02:00
naofum
834f599fb1
Translated using Weblate (Japanese) 
Currently translated at 100.0% (478 of 478 strings)
 2019-10-16 05:20:31 +02:00
Enol P
701207dcc5
Translated using Weblate (Asturian) 
Currently translated at 38.9% (186 of 478 strings)
 2019-10-16 05:20:31 +02:00
Daniele Lira Mereb
19ba37dfad
Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (478 of 478 strings)
 2019-10-16 05:20:29 +02:00
Oguz Ersen
284228ef16
Translated using Weblate (Turkish) 
Currently translated at 100.0% (478 of 478 strings)
 2019-10-16 05:20:27 +02:00
Tushar Pandey
26a1b1377d
Added translation using Weblate (Pirate) 2019-10-15 17:13:04 +02:00
Haggai Eran
884528927e Fix Hebrew translation on some devices 
Hebrew on android uses two locale codes (iw and he).
See details here: https://stackoverflow.com/a/8470980

For example, Nexus 7 (2013) uses iw, so it shows the English UI even when configuring the tablet to use Hebrew.

Add a symbolic link from values-iw to values-he so both use the same strings.
 2019-10-12 12:21:01 +03:00
Igor Nedoboy
4688b1fe23
Translated using Weblate (Russian) 
Currently translated at 100.0% (478 of 478 strings)
 2019-10-12 07:08:12 +02:00
Hosted Weblate
dfd558f848
Merge branch 'origin/dev' into Weblate. 2019-10-11 16:00:20 +02:00
ssantos
d2e065d273
Translated using Weblate (Portuguese) 
Currently translated at 100.0% (478 of 478 strings)
 2019-10-11 16:00:20 +02:00
AntonAkovP
84a52342ab
Translated using Weblate (Bulgarian) 
Currently translated at 80.5% (385 of 478 strings)
 2019-10-11 16:00:19 +02:00
Igor Nedoboy
6f3d5e9fb8
Translated using Weblate (Russian) 
Currently translated at 100.0% (478 of 478 strings)
 2019-10-11 16:00:18 +02:00
朱程宇
7d18eb8b02
Translated using Weblate (Chinese (Hong Kong)) 
Currently translated at 28.0% (134 of 478 strings)
 2019-10-11 16:00:17 +02:00
朱程宇
7e3eb5e14d
Added translation using Weblate (Chinese (Simplified)) 2019-10-11 16:00:09 +02:00
Mauricio Colli
8245e878e3
Fix broken video count text translations 
- Someone had the brilliant idea of removing the string arguments,
giving the the wrong example for other languages in the process.
 2019-10-10 22:56:20 -03:00
TobiGr
e64a7809e4 Merge remote-tracking branch 'Weblate/dev' into dev 2019-10-10 14:03:39 +02:00
Xuân Hải Trần
d4a761ceff
Translated using Weblate (Vietnamese) 
Currently translated at 98.3% (470 of 478 strings)
 2019-10-09 09:26:37 +02:00
Hosted Weblate
7f7313d69a
Merge branch 'origin/dev' into Weblate. 2019-10-08 14:57:42 +02:00
Jeff Huang
6ec7dba751
Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (478 of 478 strings)
 2019-10-08 14:57:40 +02:00
JoC
33564974b8
Translated using Weblate (Spanish) 
Currently translated at 100.0% (478 of 478 strings)
 2019-10-08 14:57:39 +02:00
Farándula
baaa9f68dc
Translated using Weblate (Spanish) 
Currently translated at 100.0% (478 of 478 strings)
 2019-10-08 14:57:39 +02:00
thami simo
0142f8bf0c
Translated using Weblate (Arabic) 
Currently translated at 100.0% (478 of 478 strings)
 2019-10-08 14:57:38 +02:00
pjammo
ad534ddbb6
Translated using Weblate (Italian) 
Currently translated at 99.6% (476 of 478 strings)
 2019-10-08 14:57:38 +02:00
Yaron Shahrabani
673a59e4c4
Translated using Weblate (Hebrew) 
Currently translated at 100.0% (478 of 478 strings)
 2019-10-08 14:57:37 +02:00
ask6155
39d848c62c
Translated using Weblate (Hindi) 
Currently translated at 71.1% (340 of 478 strings)
 2019-10-08 14:57:37 +02:00
Marc Riera
35059b7507
Translated using Weblate (Catalan) 
Currently translated at 96.7% (462 of 478 strings)
 2019-10-08 14:57:36 +02:00
naofum
f698c914f6
Translated using Weblate (Japanese) 
Currently translated at 100.0% (478 of 478 strings)
 2019-10-08 14:57:31 +02:00
uievawkejf
02cccf9e27
Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (478 of 478 strings)
 2019-10-08 14:57:31 +02:00
Milkdrop
54e763c71e
Translated using Weblate (Romanian) 
Currently translated at 79.5% (380 of 478 strings)
 2019-10-08 14:57:30 +02:00
nautilusx
4c9709a2bb
Translated using Weblate (German) 
Currently translated at 100.0% (478 of 478 strings)
 2019-10-08 14:57:29 +02:00
Heart Kris
297b5bc55c
Translated using Weblate (Filipino) 
Currently translated at 7.9% (38 of 478 strings)
 2019-10-08 14:57:29 +02:00
Oguz Ersen
ab9cb063b2
Translated using Weblate (Turkish) 
Currently translated at 100.0% (478 of 478 strings)
 2019-10-08 14:57:23 +02:00
Robin
b2b32ce67b fix NPE, fix 'wrong' constant, avoid unnecessary nulling 2019-10-08 06:36:29 +02:00
Redirion
7aeb1ec8d9
Apply suggestions from code review 
Co-Authored-By: Tobias Groza <TobiGr@users.noreply.github.com>
 2019-10-07 11:27:43 +02:00
Robin
50b51f931e Make use of isPlaying feature of ExoPlayer 2.10.5 2019-10-07 11:18:27 +02:00
Robin
bf353875b0 Update okhttp to match ExoPlayer 2019-10-07 11:18:26 +02:00
Robin
87eab2a9b0 Fixed deprecations 2019-10-07 11:18:26 +02:00
Robin
dcd5197a19 Update to ExoPlayer 2.10.5 2019-10-07 11:18:26 +02:00
TobiGr
a02e12abe8 Update extractor 2019-10-07 11:01:01 +02:00
Tobias Groza
ce17ccad27
Merge pull request #2685 from Redirion/androidx3 
Migrate to AndroidX
 2019-10-07 01:51:20 +02:00
Ivan
74c7eb616f Clear search box has now only one animation - issue #2644 solved 2019-10-05 21:57:33 +01:00
Redirion
81f1dc9839
Merge branch 'dev' into androidx3 2019-10-05 17:21:31 +02:00
TobiGr
2269a95b99 Remove unused Gema string from translation 2019-10-05 15:07:30 +02:00
Robin
bf2a3ca043 Migrate to AndroidX 2019-10-04 14:59:08 +02:00
Hosted Weblate
d400ac5705
Merge branch 'origin/dev' into Weblate. 2019-10-02 11:56:21 +02:00
JS Ahn
61e57c9373
Translated using Weblate (Korean) 
Currently translated at 99.2% (473 of 477 strings)
 2019-10-02 11:56:19 +02:00
Arttu Ylhävuori
db1cd7dd6b
Translated using Weblate (Finnish) 
Currently translated at 65.6% (313 of 477 strings)
 2019-10-02 11:56:18 +02:00
Ğąme Ǿver!
8680bcda61
Translated using Weblate (Persian) 
Currently translated at 98.1% (468 of 477 strings)
 2019-10-02 11:56:18 +02:00
Mostafa Ahangarha
5db40a0ede
Translated using Weblate (Persian) 
Currently translated at 98.1% (468 of 477 strings)
 2019-10-02 11:56:17 +02:00
Mohammad Reza Haddad
d4e80ef268
Translated using Weblate (Persian) 
Currently translated at 98.1% (468 of 477 strings)
 2019-10-02 11:56:08 +02:00
WaldiS
262a4e2bfd
Translated using Weblate (Polish) 
Currently translated at 100.0% (477 of 477 strings)
 2019-10-02 11:56:06 +02:00
Marc Riera
1037798879
Translated using Weblate (Catalan) 
Currently translated at 96.0% (458 of 477 strings)
 2019-10-02 11:56:06 +02:00
naofum
bcfdde65b0
Translated using Weblate (Japanese) 
Currently translated at 100.0% (477 of 477 strings)
 2019-10-02 11:56:04 +02:00
Emin Tufan Çetin
73d145616a
Translated using Weblate (Turkish) 
Currently translated at 100.0% (477 of 477 strings)
 2019-10-02 11:56:03 +02:00
yausername
cf6380b3c7 Merge remote-tracking branch 'upstream/dev' into videoDetailscrollFix 2019-10-02 06:35:44 +05:30
yausername
0593aaa0c1 fix scroll jittering 2019-10-02 06:29:20 +05:30
Tobias Groza
24babd47a2
Merge pull request #2535 from jimbo1qaz/add-transitive-dependencies 
Add missing dependencies inherited from NewPipeExtractor into NewPipe
 2019-10-01 22:15:23 +02:00
Stypox
ad411344db
Merge branch 'dev' into add-transitive-dependencies 2019-10-01 21:07:41 +02:00
Stypox
2097d2e4e4
Merge branch 'dev' into accessebility 2019-10-01 21:04:05 +02:00
kapodamy
08a081437f
Update DownloadRunnable.java 2019-10-01 15:31:15 -03:00
kapodamy
b1d89175fc
Update DownloadRunnable.java 
add description
 2019-10-01 13:09:26 -03:00
Mohammad Reza Haddad
97e57dcbab
Translated using Weblate (Persian) 
Currently translated at 72.3% (345 of 477 strings)
 2019-09-30 16:49:49 +02:00
Mostafa Ahangarha
f46fa72556
Translated using Weblate (Persian) 
Currently translated at 72.3% (345 of 477 strings)
 2019-09-30 16:49:49 +02:00
Mohammad Reza Haddad
242c2fc04a
Translated using Weblate (Persian) 
Currently translated at 70.2% (335 of 477 strings)
 2019-09-30 16:41:42 +02:00
Mostafa Ahangarha
1523cfdc45
Translated using Weblate (Persian) 
Currently translated at 70.2% (335 of 477 strings)
 2019-09-30 16:41:42 +02:00
yausername
5d9b5a063b fix scrolling in video detail fragment. fixes #2627 2019-09-29 22:05:29 +05:30
Allan Nordhøy
0417c47fe2
Translated using Weblate (Norwegian Bokmål) 
Currently translated at 95.2% (454 of 477 strings)
 2019-09-28 16:55:53 +02:00
Jeff Huang
0da5717bb5
Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-28 16:55:53 +02:00
Florian
73c4ec378b
Translated using Weblate (French) 
Currently translated at 99.6% (475 of 477 strings)
 2019-09-28 16:55:52 +02:00
thami simo
1b54791905
Translated using Weblate (Arabic) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-28 16:55:52 +02:00
random r
4299062bd0
Translated using Weblate (Italian) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-28 16:55:50 +02:00
Yaron Shahrabani
015ef402eb
Translated using Weblate (Hebrew) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-28 16:55:50 +02:00
ssantos
378c6c576c
Translated using Weblate (Portuguese) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-28 16:55:49 +02:00
winqooq
b6cb95695e
Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-28 16:55:49 +02:00
winqooq
c922b49731
Translated using Weblate (Russian) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-28 16:55:48 +02:00
Hosted Weblate
60c4f86b08
Merge branch 'origin/dev' into Weblate. 2019-09-25 14:14:38 +02:00
Tawhid H
afdb8e0d37
Translated using Weblate (Bengali (Bangladesh)) 
Currently translated at 27.0% (129 of 477 strings)
 2019-09-25 14:14:38 +02:00
Xiang Xu
502a458dfd
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-25 14:14:38 +02:00
Jeff Huang
ff986a99b6
Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-25 14:14:37 +02:00
pjammo
939c2a2494
Translated using Weblate (Italian) 
Currently translated at 99.8% (476 of 477 strings)
 2019-09-25 14:14:37 +02:00
winqooq
38234c005e
Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-25 14:14:36 +02:00
Igor Nedoboy
a67e5357ef
Translated using Weblate (Russian) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-25 14:14:35 +02:00
Heart Kris
9fe4af9550
Added translation using Weblate (Filipino) 2019-09-25 14:14:33 +02:00
Christian Schabesberger
6622611ee3
Merge branch 'dev' into accessebility 2019-09-24 21:26:13 +02:00
kapodamy
ecb4bfde0b check if last byte on block is downloaded 2019-09-23 15:45:48 -03:00
Éfrit
1bee297bba Revert "Translated using Weblate (English)" 
This reverts commit 09e2381475.
 2019-09-23 10:30:08 +02:00
WaldiS
0e7817f7e5
Translated using Weblate (Polish) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-22 17:08:36 +02:00
ssantos
fafd1126f4
Translated using Weblate (Portuguese) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-22 17:08:36 +02:00
naofum
a67f167666
Translated using Weblate (Japanese) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-22 17:08:35 +02:00
Christian Schabesberger
7e65648412 change video preview text 2019-09-22 13:34:44 +02:00
Christian Schabesberger
003170e6d8 add tab description and download dialog bag button 2019-09-22 13:26:53 +02:00
Christian Schabesberger
28accff9ba add content description for toggle service button 2019-09-22 11:59:50 +02:00
Florian
7e6722f0f8
Translated using Weblate (French) 
Currently translated at 99.6% (475 of 477 strings)
 2019-09-21 21:09:47 +02:00
JoC
d909ac0e59
Translated using Weblate (Spanish) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-21 21:09:47 +02:00
zmni
2869e53421
Translated using Weblate (Indonesian) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-21 21:09:46 +02:00
Yaron Shahrabani
0b145682ba
Translated using Weblate (Hebrew) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-21 21:09:46 +02:00
zeritti
0ef52adb18
Translated using Weblate (Czech) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-21 21:09:45 +02:00
nautilusx
4b76b70ea0
Translated using Weblate (German) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-21 21:09:43 +02:00
Oguz Ersen
586fa99065
Translated using Weblate (Turkish) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-21 21:09:42 +02:00
Hosted Weblate
26184aca10
Merge branch 'origin/dev' into Weblate. 2019-09-21 05:43:08 +02:00
Jeff Huang
79ed4d5f50
Translated using Weblate (Chinese (Traditional)) 
Currently translated at 99.8% (476 of 477 strings)
 2019-09-21 05:43:06 +02:00
JS Ahn
87b546e7fb
Translated using Weblate (Korean) 
Currently translated at 99.4% (474 of 477 strings)
 2019-09-21 05:43:06 +02:00
thami simo
a4b8fe41c0
Translated using Weblate (Arabic) 
Currently translated at 99.8% (476 of 477 strings)
 2019-09-21 05:43:05 +02:00
pjammo
8b44bf4d9b
Translated using Weblate (Italian) 
Currently translated at 99.6% (475 of 477 strings)
 2019-09-21 05:43:05 +02:00
Laszlo Almasi
e09b7c592c
Translated using Weblate (Hungarian) 
Currently translated at 68.8% (328 of 477 strings)
 2019-09-21 05:43:04 +02:00
ssantos
6ea5d1a1ff
Translated using Weblate (Portuguese) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-21 05:43:04 +02:00
naofum
c5fa1122ae
Translated using Weblate (Japanese) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-21 05:43:03 +02:00
Oguz Ersen
7fa75a3d54
Translated using Weblate (English) 
Currently translated at 99.8% (476 of 477 strings)
 2019-09-21 05:43:03 +02:00
BugviewTH Soros
358f94a7ec
Translated using Weblate (Thai) 
Currently translated at 56.8% (271 of 477 strings)
 2019-09-21 05:43:03 +02:00
Oguz Ersen
07ac539c8f
Translated using Weblate (Turkish) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-21 05:43:01 +02:00
TobiGr
c36075f4e3 Merge remote-tracking branch 'Weblate/dev' into dev 2019-09-20 16:34:09 +02:00
Tobias Groza
862e08a06c
Merge branch 'dev' into opusforlife2-patch-1 2019-09-20 16:24:51 +02:00
Christian Schabesberger
748f70ba87 fix subscriber count 2019-09-18 15:31:06 +02:00
opusforlife2
9425f0ca1a
Change the language of the download folder setting 
Make it more consistent and less ambiguous
 2019-09-16 19:39:28 +00:00
Hosted Weblate
4a3d7002eb
Merge branch 'origin/dev' into Weblate. 2019-09-14 21:24:02 +02:00
JS Ahn
6d94ccb756
Translated using Weblate (Korean) 
Currently translated at 99.4% (474 of 477 strings)
 2019-09-14 21:23:59 +02:00
Alexis Raison
6cf83c5c1a
Translated using Weblate (French) 
Currently translated at 99.4% (474 of 477 strings)
 2019-09-14 21:23:58 +02:00
Florian
4bce257189
Translated using Weblate (French) 
Currently translated at 99.4% (474 of 477 strings)
 2019-09-14 21:23:57 +02:00
zmni
c495fb92f3
Translated using Weblate (Indonesian) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-14 21:23:57 +02:00
thami simo
3102b4bdb7
Translated using Weblate (Arabic) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-14 21:23:56 +02:00
WaldiS
4e232602db
Translated using Weblate (Polish) 
Currently translated at 99.8% (476 of 477 strings)
 2019-09-14 21:23:55 +02:00
Yaron Shahrabani
d5ecf1e8dd
Translated using Weblate (Hebrew) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-14 21:23:55 +02:00
ssantos
c019cf57e5
Translated using Weblate (Portuguese) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-14 21:23:54 +02:00
naofum
0db3d7ffd3
Translated using Weblate (Japanese) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-14 21:23:54 +02:00
Igor Nedoboy
ab846be65e
Translated using Weblate (Russian) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-14 21:23:54 +02:00
postsorino
1a4e83cb5a
Translated using Weblate (Greek) 
Currently translated at 100.0% (477 of 477 strings)
 2019-09-14 21:23:53 +02:00
C. Rüdinger
7cd5d5b4c3
Translated using Weblate (German) 
Currently translated at 99.8% (476 of 477 strings)
 2019-09-14 21:23:49 +02:00
TobiGr
ec4757d6de Move on to 0.17.3 2019-09-12 22:52:40 +02:00
TobiGr
6447af8541 Update extractor version to fix live streams 2019-09-12 22:43:07 +02:00
Christian Schabesberger
209c1f8bc2 merge master back into dev 2019-09-12 13:22:24 +02:00
Tobias Groza
5e101a4d32
Merge branch 'dev' into patch-1 2019-09-12 09:23:30 +02:00