diff options
| author | redmatrix <git@macgirvin.com> | 2016-04-21 01:08:38 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-04-21 01:08:38 -0700 |
| commit | 4669107634c7fe8de06cb8404d8a021d22dfd29b (patch) | |
| tree | 3e9573ee3f5e124261e61f642e56ffee028621b3 | |
| parent | 657b34c012210bb916adca878b08789d1b347103 (diff) | |
| parent | cf79c4ea4868f045ce22304c23db19a41f816cd7 (diff) | |
| download | volse-hubzilla-4669107634c7fe8de06cb8404d8a021d22dfd29b.tar.gz volse-hubzilla-4669107634c7fe8de06cb8404d8a021d22dfd29b.tar.bz2 volse-hubzilla-4669107634c7fe8de06cb8404d8a021d22dfd29b.zip | |
Merge branch 'master' into dev
| -rwxr-xr-x | .openshift/action_hooks/deploy | 24 | ||||
| -rw-r--r-- | version.inc | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/.openshift/action_hooks/deploy b/.openshift/action_hooks/deploy index c3bdf575a..bc3050339 100755 --- a/.openshift/action_hooks/deploy +++ b/.openshift/action_hooks/deploy @@ -197,22 +197,22 @@ 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" +# Hubzilla themes - unofficial repo +echo "Try to add or update Hubzilla themes - unofficial repo" cd ${OPENSHIFT_REPO_DIR} -util/add_theme_repo https://github.com/DeadSuperHero/hubzilla-themes.git DeadSuperHeroThemes +util/add_theme_repo https://github.com/DeadSuperHero/hubzilla-themes.git DeadSuperHeroThemes insecure -# Hubzilla ownMapp -echo "Try to add or update Hubzilla ownMapp" +# Hubzilla ownMapp - unofficial repo +echo "Try to add or update Hubzilla ownMapp - unofficial repo" cd ${OPENSHIFT_REPO_DIR} -util/add_addon_repo https://gitlab.com/zot/ownmapp.git ownMapp +util/add_addon_repo https://gitlab.com/zot/ownmapp.git ownMapp insecure -# Hubzilla Chess -echo "Try to add or update Hubzilla chess " +# Hubzilla Chess - unofficial repo +echo "Try to add or update Hubzilla chess - unofficial repo" cd ${OPENSHIFT_REPO_DIR} -util/add_addon_repo https://gitlab.com/zot/hubzilla-chess.git Chess +util/add_addon_repo https://gitlab.com/zot/hubzilla-chess.git Chess insecure -# Hubzilla Hubsites -echo "Try to add or update Hubzilla Hubsites" +# Hubzilla Hubsites - unofficial repo +echo "Try to add or update Hubzilla Hubsites - unofficial repo" cd ${OPENSHIFT_REPO_DIR} -util/add_addon_repo https://gitlab.com/zot/hubsites.git Hubsites +util/add_addon_repo https://gitlab.com/zot/hubsites.git Hubsites insecure diff --git a/version.inc b/version.inc index c414fb0fd..70f35be4a 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2016-04-20.1372H +2016-04-21.1373H |