From 31961fddfdcdbaf89f045f464c1c885fcae4382b Mon Sep 17 00:00:00 2001 From: Megan Martinson Date: Tue, 30 May 2017 11:51:21 -0500 Subject: [PATCH 1/2] changed public custom folder to new repo --- .gitmodules | 6 +++--- imports/plugins/custom | 2 +- public/custom | 1 + public/custom/.gitkeep | 0 public/custom/ReactionPublicCustomFolder | 1 - 5 files changed, 5 insertions(+), 5 deletions(-) create mode 160000 public/custom delete mode 100644 public/custom/.gitkeep delete mode 160000 public/custom/ReactionPublicCustomFolder diff --git a/.gitmodules b/.gitmodules index 739b6f365ee..2a731b5cbce 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "public/custom/ReactionPublicCustomFolder"] - path = public/custom/ReactionPublicCustomFolder - url = git@github.com:evereveofficial/ReactionPublicCustomFolder.git [submodule "imports/plugins/custom"] path = imports/plugins/custom url = git@github.com:evereveofficial/eePlugins.git @@ -10,3 +7,6 @@ [submodule "private/settings"] path = private/settings url = git@github.com:evereveofficial/ReactionPrivateSettings.git +[submodule "public/custom"] + path = public/custom + url = git@github.com:evereveofficial/eePublicCustom.git diff --git a/imports/plugins/custom b/imports/plugins/custom index e8a04d54b29..064c8efddf0 160000 --- a/imports/plugins/custom +++ b/imports/plugins/custom @@ -1 +1 @@ -Subproject commit e8a04d54b29520e9241aeed7cd1cd409c6edd756 +Subproject commit 064c8efddf0d129c356fc1382aa449fb2eb2cc40 diff --git a/public/custom b/public/custom new file mode 160000 index 00000000000..b115da2dc4e --- /dev/null +++ b/public/custom @@ -0,0 +1 @@ +Subproject commit b115da2dc4e0fe860e02cb589b2fab55dcb18fd8 diff --git a/public/custom/.gitkeep b/public/custom/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/public/custom/ReactionPublicCustomFolder b/public/custom/ReactionPublicCustomFolder deleted file mode 160000 index d4a8e870234..00000000000 --- a/public/custom/ReactionPublicCustomFolder +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d4a8e8702343f771edad34df2837c82c4c7b9671 From 3a02d3bdab35767fb4f0c757a51c943efe77bd3f Mon Sep 17 00:00:00 2001 From: Megan Martinson Date: Tue, 30 May 2017 12:14:30 -0500 Subject: [PATCH 2/2] fixing circle problems maybe. --- public/custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/custom b/public/custom index b115da2dc4e..047a4a0ef7d 160000 --- a/public/custom +++ b/public/custom @@ -1 +1 @@ -Subproject commit b115da2dc4e0fe860e02cb589b2fab55dcb18fd8 +Subproject commit 047a4a0ef7dbaad932e6a2fc4ec5948e5a78b8bc