diff options
| author | Jean-François Milants <jf@codingfield.com> | 2022-09-11 14:59:49 +0200 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2022-09-11 14:59:49 +0200 |
| commit | ada2c09581d2d13acfa5ce9a97671c0ec17863f1 (patch) | |
| tree | 2f776adc59d0c63e403d2043cb8460e65d6c46fe /docker/README.md | |
| parent | 18cff286c75f432095db4b188e0f9a8a9e2bd8e8 (diff) | |
| parent | c9a5c3fa5c930a5939d3114a6c6b48570d61ca24 (diff) | |
Merge branch 'develop' into infineat-external-resources
# Conflicts:
# src/displayapp/screens/Symbols.h
# src/displayapp/screens/settings/SettingWatchFace.cpp
# src/displayapp/screens/settings/SettingWatchFace.h
Diffstat (limited to 'docker/README.md')
| -rw-r--r-- | docker/README.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/README.md b/docker/README.md index 71ad258a..5b897b2b 100644 --- a/docker/README.md +++ b/docker/README.md @@ -1,2 +1,2 @@ Docker images and build script for building the project using Docker. -See [this page for more info](../doc/buildWithDocker.md).
\ No newline at end of file +See [this page for more info](../doc/buildWithDocker.md). |