Merge origin/master into fix-button-handler and resolve sd-fonts manifest conflict
This commit is contained in:
commit
e454463f86
5 files changed
+483
-28
No files matched your search
@@ -8,7 +8,7 @@
|
||||
#include "util/ButtonNavigator.h"
|
||||
|
||||
#ifndef FONT_MANIFEST_URL
|
||||
#define FONT_MANIFEST_URL "https://github.com/jpirnay/crosspoint-reader/assets/sd-fonts/fonts.json"
|
||||
#define FONT_MANIFEST_URL "https://github.com/jpirnay/crosspoint-reader/blob/master/assets/sd-fonts/sd-fonts.yaml"
|
||||
#endif
|
||||
|
||||
class FontDownloadActivity : public Activity {
|
||||
|
||||
Reference in new issue
Block a user