TobiGr 16d4a034e2 Merge remote-tracking branch 'origin/dev' into notifications		2021-10-14 21:15:43 +02:00
..
assets	Update displayed licenses	2020-12-31 19:26:41 -05:00
java	Merge remote-tracking branch 'origin/dev' into notifications	2021-10-14 21:15:43 +02:00
res	Merge remote-tracking branch 'origin/dev' into notifications	2021-10-14 21:15:43 +02:00
AndroidManifest.xml	Merge pull request #6642 from magicbrothers/add-eduvid	2021-10-02 18:32:00 +02:00