Merge branch 'pi' into dev

# Conflicts: # dc3/nginx/conf.d/default.conf
4 years ago · 14ef4fd65c
parent 73effbed1a 2c5f7da680
commit 14ef4fd65c
13 changed files with 0 additions and 0 deletions
--- a/dc3/images/demo/1.png
+++ b/dc3/images/demo/1.png
--- a/dc3/images/demo/10.png
+++ b/dc3/images/demo/10.png
--- a/dc3/images/demo/11.png
+++ b/dc3/images/demo/11.png
--- a/dc3/images/demo/12.png
+++ b/dc3/images/demo/12.png
--- a/dc3/images/demo/13.png
+++ b/dc3/images/demo/13.png
--- a/dc3/images/demo/2.png
+++ b/dc3/images/demo/2.png
--- a/dc3/images/demo/3.png
+++ b/dc3/images/demo/3.png
--- a/dc3/images/demo/4.png
+++ b/dc3/images/demo/4.png
--- a/dc3/images/demo/5.png
+++ b/dc3/images/demo/5.png
--- a/dc3/images/demo/6.png
+++ b/dc3/images/demo/6.png
--- a/dc3/images/demo/7.png
+++ b/dc3/images/demo/7.png
--- a/dc3/images/demo/8.png
+++ b/dc3/images/demo/8.png
--- a/dc3/images/demo/9.png
+++ b/dc3/images/demo/9.png