Merge branch 'Quest/ispconfig3-master'
Conflicts: install/sql/incremental/upd_dev_collection.sql
No related branches found
No related tags found
Showing
- install/apps/metronome-init 75 additions, 0 deletionsinstall/apps/metronome-init
- install/apps/metronome_libs/mod_auth_external/authenticate_isp.sh 38 additions, 0 deletions...apps/metronome_libs/mod_auth_external/authenticate_isp.sh
- install/apps/metronome_libs/mod_auth_external/db_auth.php 58 additions, 0 deletionsinstall/apps/metronome_libs/mod_auth_external/db_auth.php
- install/apps/metronome_libs/mod_auth_external/db_conf.inc.php 6 additions, 0 deletions...all/apps/metronome_libs/mod_auth_external/db_conf.inc.php
- install/apps/metronome_libs/mod_auth_external/db_isuser.php 37 additions, 0 deletionsinstall/apps/metronome_libs/mod_auth_external/db_isuser.php
- install/apps/metronome_libs/mod_auth_external/mod_auth_external.lua 118 additions, 0 deletions...ps/metronome_libs/mod_auth_external/mod_auth_external.lua
- install/apps/metronome_libs/mod_discoitems.lua 24 additions, 0 deletionsinstall/apps/metronome_libs/mod_discoitems.lua
- install/apps/metronome_libs/mod_webpresence/icons/status_away.png 0 additions, 0 deletions...apps/metronome_libs/mod_webpresence/icons/status_away.png
- install/apps/metronome_libs/mod_webpresence/icons/status_chat.png 0 additions, 0 deletions...apps/metronome_libs/mod_webpresence/icons/status_chat.png
- install/apps/metronome_libs/mod_webpresence/icons/status_dnd.png 0 additions, 0 deletions.../apps/metronome_libs/mod_webpresence/icons/status_dnd.png
- install/apps/metronome_libs/mod_webpresence/icons/status_offline.png 0 additions, 0 deletions...s/metronome_libs/mod_webpresence/icons/status_offline.png
- install/apps/metronome_libs/mod_webpresence/icons/status_online.png 0 additions, 0 deletions...ps/metronome_libs/mod_webpresence/icons/status_online.png
- install/apps/metronome_libs/mod_webpresence/icons/status_xa.png 0 additions, 0 deletions...l/apps/metronome_libs/mod_webpresence/icons/status_xa.png
- install/apps/metronome_libs/mod_webpresence/mod_webpresence.lua 118 additions, 0 deletions...l/apps/metronome_libs/mod_webpresence/mod_webpresence.lua
- install/dist/conf/debian60.conf.php 4 additions, 0 deletionsinstall/dist/conf/debian60.conf.php
- install/dist/lib/debian60.lib.php 4 additions, 0 deletionsinstall/dist/lib/debian60.lib.php
- install/install.php 19 additions, 0 deletionsinstall/install.php
- install/lib/installer_base.lib.php 122 additions, 1 deletioninstall/lib/installer_base.lib.php
- install/sql/incremental/upd_dev_collection.sql 94 additions, 0 deletionsinstall/sql/incremental/upd_dev_collection.sql
- install/sql/ispconfig3.sql 96 additions, 0 deletionsinstall/sql/ispconfig3.sql
Loading
Please register or sign in to comment