From 6aa9882a1c3eda8db48b611d8b5659c780149c8d Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Thu, 5 Aug 2021 09:03:14 +0100
Subject: [PATCH] Merge remote-tracking branch 'dev-env/jpa-monorepo' into main
GitOrigin-RevId: 9128e3b9c9e05476356045697667df2ca3b3cf25
---
server-ce/CONTRIBUTING.md => CONTRIBUTING.md | 0
server-ce/LICENSE => LICENSE | 0
server-ce/README.md => README.md | 0
{server-ce/doc => doc}/logo.png | Bin
{server-ce/doc => doc}/screenshot.png | Bin
...er-compose.debug.yml => docker-compose.debug.yml | 0
server-ce/docker-compose.yml => docker-compose.yml | 0
7 files changed, 0 insertions(+), 0 deletions(-)
rename server-ce/CONTRIBUTING.md => CONTRIBUTING.md (100%)
rename server-ce/LICENSE => LICENSE (100%)
rename server-ce/README.md => README.md (100%)
rename {server-ce/doc => doc}/logo.png (100%)
rename {server-ce/doc => doc}/screenshot.png (100%)
rename server-ce/docker-compose.debug.yml => docker-compose.debug.yml (100%)
rename server-ce/docker-compose.yml => docker-compose.yml (100%)
diff --git a/server-ce/CONTRIBUTING.md b/CONTRIBUTING.md
similarity index 100%
rename from server-ce/CONTRIBUTING.md
rename to CONTRIBUTING.md
diff --git a/server-ce/LICENSE b/LICENSE
similarity index 100%
rename from server-ce/LICENSE
rename to LICENSE
diff --git a/server-ce/README.md b/README.md
similarity index 100%
rename from server-ce/README.md
rename to README.md
diff --git a/server-ce/doc/logo.png b/doc/logo.png
similarity index 100%
rename from server-ce/doc/logo.png
rename to doc/logo.png
diff --git a/server-ce/doc/screenshot.png b/doc/screenshot.png
similarity index 100%
rename from server-ce/doc/screenshot.png
rename to doc/screenshot.png
diff --git a/server-ce/docker-compose.debug.yml b/docker-compose.debug.yml
similarity index 100%
rename from server-ce/docker-compose.debug.yml
rename to docker-compose.debug.yml
diff --git a/server-ce/docker-compose.yml b/docker-compose.yml
similarity index 100%
rename from server-ce/docker-compose.yml
rename to docker-compose.yml
--
GitLab