[Fix] Fix conflicts ._.

This commit is contained in:
Quentin
2020-04-07 14:53:19 +02:00
194 changed files with 4774 additions and 1958 deletions

View File

@@ -18,7 +18,7 @@ else
include $(EXTAPP_PATH)/sources.mak
endif
app_src += $(app_external_src)
apps_src += $(app_external_src)
i18n_files += $(addprefix apps/external/,\
base.de.i18n\