From f23e8f8d41f9fba23b0e65f9bf9fae1342ffc4d4 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 20 Dec 2015 14:55:43 -0800 Subject: merge hell --- .openshift/action_hooks/deploy | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to '.openshift') diff --git a/.openshift/action_hooks/deploy b/.openshift/action_hooks/deploy index 7abe3efd1..f3f187d43 100755 --- a/.openshift/action_hooks/deploy +++ b/.openshift/action_hooks/deploy @@ -190,16 +190,16 @@ util/config directory globaldir 1 util/config directory pubforums 0 # Hubzill addons -# echo "Try to add or update Hubzilla addons" -# cd ${OPENSHIFT_REPO_DIR} -# util/add_addon_repo https://github.com/redmatrix/hubzilla-addons.git HubzillaAddons +echo "Try to add or update Hubzilla addons" +cd ${OPENSHIFT_REPO_DIR} +util/add_addon_repo https://github.com/redmatrix/hubzilla-addons.git HubzillaAddons # Hubzilla themes -# echo "Try to add or update Hubzilla themes" -# cd ${OPENSHIFT_REPO_DIR} -# util/add_theme_repo https://github.com/DeadSuperHero/redmatrix-themes.git DeadSuperHeroThemes +echo "Try to add or update Hubzilla themes" +cd ${OPENSHIFT_REPO_DIR} +util/add_theme_repo https://github.com/DeadSuperHero/redmatrix-themes.git DeadSuperHeroThemes # Hubzilla ownMapp -# echo "Try to add or update Hubzilla ownMapp" -# cd ${OPENSHIFT_REPO_DIR} -# util/add_addon_repo https://gitlab.com/zot/ownmapp.git ownMapp +echo "Try to add or update Hubzilla ownMapp" +cd ${OPENSHIFT_REPO_DIR} +util/add_addon_repo https://gitlab.com/zot/ownmapp.git ownMapp -- cgit v1.2.3