From 9b2baf764d560a42a53a104dd81bcb89e8277be0 Mon Sep 17 00:00:00 2001 From: Quentin Duchemin <quentinduchemin@tuta.io> Date: Thu, 9 Jan 2020 00:43:59 +0100 Subject: [PATCH] Merge Romain repository into main repository Thanks to the excellent trick here : http://gbayer.com/development/moving-files-from-one-git-repository-to-another-preserving-history/ --- Dockerfile => pica-lufi/Dockerfile | 0 docker-compose.yml => pica-lufi/docker-compose.yml | 0 lufi.conf => pica-lufi/lufi.conf | 0 lufi.env => pica-lufi/lufi.env | 0 {picadrop => pica-lufi/picadrop}/Makefile | 0 {picadrop => pica-lufi/picadrop}/lib/Lufi/I18N.pm | 0 .../picadrop}/public/img/favicon.png | Bin .../picadrop}/public/img/lufi-min.png | Bin .../picadrop}/public/img/lufi.png | Bin .../picadrop}/public/img/lufi.xcf | Bin .../picadrop}/public/img/lufi120.png | Bin .../picadrop}/public/img/lufi128.png | Bin .../picadrop}/public/img/lufi152.png | Bin .../picadrop}/public/img/lufi196.png | Bin .../picadrop}/public/img/lufi60.png | Bin .../picadrop}/public/img/lufi76.png | Bin .../picadrop}/public/img/lufi_favicon.png | Bin .../picadrop}/templates/layouts/default.html.ep | 0 18 files changed, 0 insertions(+), 0 deletions(-) rename Dockerfile => pica-lufi/Dockerfile (100%) rename docker-compose.yml => pica-lufi/docker-compose.yml (100%) rename lufi.conf => pica-lufi/lufi.conf (100%) rename lufi.env => pica-lufi/lufi.env (100%) rename {picadrop => pica-lufi/picadrop}/Makefile (100%) rename {picadrop => pica-lufi/picadrop}/lib/Lufi/I18N.pm (100%) rename {picadrop => pica-lufi/picadrop}/public/img/favicon.png (100%) rename {picadrop => pica-lufi/picadrop}/public/img/lufi-min.png (100%) rename {picadrop => pica-lufi/picadrop}/public/img/lufi.png (100%) rename {picadrop => pica-lufi/picadrop}/public/img/lufi.xcf (100%) rename {picadrop => pica-lufi/picadrop}/public/img/lufi120.png (100%) rename {picadrop => pica-lufi/picadrop}/public/img/lufi128.png (100%) rename {picadrop => pica-lufi/picadrop}/public/img/lufi152.png (100%) rename {picadrop => pica-lufi/picadrop}/public/img/lufi196.png (100%) rename {picadrop => pica-lufi/picadrop}/public/img/lufi60.png (100%) rename {picadrop => pica-lufi/picadrop}/public/img/lufi76.png (100%) rename {picadrop => pica-lufi/picadrop}/public/img/lufi_favicon.png (100%) rename {picadrop => pica-lufi/picadrop}/templates/layouts/default.html.ep (100%) diff --git a/Dockerfile b/pica-lufi/Dockerfile similarity index 100% rename from Dockerfile rename to pica-lufi/Dockerfile diff --git a/docker-compose.yml b/pica-lufi/docker-compose.yml similarity index 100% rename from docker-compose.yml rename to pica-lufi/docker-compose.yml diff --git a/lufi.conf b/pica-lufi/lufi.conf similarity index 100% rename from lufi.conf rename to pica-lufi/lufi.conf diff --git a/lufi.env b/pica-lufi/lufi.env similarity index 100% rename from lufi.env rename to pica-lufi/lufi.env diff --git a/picadrop/Makefile b/pica-lufi/picadrop/Makefile similarity index 100% rename from picadrop/Makefile rename to pica-lufi/picadrop/Makefile diff --git a/picadrop/lib/Lufi/I18N.pm b/pica-lufi/picadrop/lib/Lufi/I18N.pm similarity index 100% rename from picadrop/lib/Lufi/I18N.pm rename to pica-lufi/picadrop/lib/Lufi/I18N.pm diff --git a/picadrop/public/img/favicon.png b/pica-lufi/picadrop/public/img/favicon.png similarity index 100% rename from picadrop/public/img/favicon.png rename to pica-lufi/picadrop/public/img/favicon.png diff --git a/picadrop/public/img/lufi-min.png b/pica-lufi/picadrop/public/img/lufi-min.png similarity index 100% rename from picadrop/public/img/lufi-min.png rename to pica-lufi/picadrop/public/img/lufi-min.png diff --git a/picadrop/public/img/lufi.png b/pica-lufi/picadrop/public/img/lufi.png similarity index 100% rename from picadrop/public/img/lufi.png rename to pica-lufi/picadrop/public/img/lufi.png diff --git a/picadrop/public/img/lufi.xcf b/pica-lufi/picadrop/public/img/lufi.xcf similarity index 100% rename from picadrop/public/img/lufi.xcf rename to pica-lufi/picadrop/public/img/lufi.xcf diff --git a/picadrop/public/img/lufi120.png b/pica-lufi/picadrop/public/img/lufi120.png similarity index 100% rename from picadrop/public/img/lufi120.png rename to pica-lufi/picadrop/public/img/lufi120.png diff --git a/picadrop/public/img/lufi128.png b/pica-lufi/picadrop/public/img/lufi128.png similarity index 100% rename from picadrop/public/img/lufi128.png rename to pica-lufi/picadrop/public/img/lufi128.png diff --git a/picadrop/public/img/lufi152.png b/pica-lufi/picadrop/public/img/lufi152.png similarity index 100% rename from picadrop/public/img/lufi152.png rename to pica-lufi/picadrop/public/img/lufi152.png diff --git a/picadrop/public/img/lufi196.png b/pica-lufi/picadrop/public/img/lufi196.png similarity index 100% rename from picadrop/public/img/lufi196.png rename to pica-lufi/picadrop/public/img/lufi196.png diff --git a/picadrop/public/img/lufi60.png b/pica-lufi/picadrop/public/img/lufi60.png similarity index 100% rename from picadrop/public/img/lufi60.png rename to pica-lufi/picadrop/public/img/lufi60.png diff --git a/picadrop/public/img/lufi76.png b/pica-lufi/picadrop/public/img/lufi76.png similarity index 100% rename from picadrop/public/img/lufi76.png rename to pica-lufi/picadrop/public/img/lufi76.png diff --git a/picadrop/public/img/lufi_favicon.png b/pica-lufi/picadrop/public/img/lufi_favicon.png similarity index 100% rename from picadrop/public/img/lufi_favicon.png rename to pica-lufi/picadrop/public/img/lufi_favicon.png diff --git a/picadrop/templates/layouts/default.html.ep b/pica-lufi/picadrop/templates/layouts/default.html.ep similarity index 100% rename from picadrop/templates/layouts/default.html.ep rename to pica-lufi/picadrop/templates/layouts/default.html.ep -- GitLab