Merge branch 'master' into remember_multiple_video_positions

This commit is contained in:
Dominik Stadler
2019-03-31 20:31:38 +02:00
committed by GitHub
34 changed files with 69 additions and 2 deletions

View File

@ -92,6 +92,7 @@ fun SimpleActivity.launchAbout() {
FAQItem(R.string.faq_12_title, R.string.faq_12_text),
FAQItem(R.string.faq_13_title, R.string.faq_13_text),
FAQItem(R.string.faq_14_title, R.string.faq_14_text),
FAQItem(R.string.faq_15_title, R.string.faq_15_text),
FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons),
FAQItem(R.string.faq_6_title_commons, R.string.faq_6_text_commons))