Merge branch 'master' of https://git.seemsleg.it/pub/php-func-lib
Conflicts: secret.php.example
This commit is contained in:
8
.gitignore
vendored
8
.gitignore
vendored
@@ -1,5 +1,5 @@
|
||||
/.buildpath
|
||||
/.project
|
||||
/secret.php
|
||||
/config.php
|
||||
/.buildpath
|
||||
/.project
|
||||
/secret.php
|
||||
/config.php
|
||||
/test.php
|
||||
|
||||
@@ -1,4 +1,2 @@
|
||||
# php-func-lib
|
||||
git submodule add https://git.seemsleg.it/ef/php-func-lib lib
|
||||
|
||||
test
|
||||
git submodule add https://git.seemsleg.it/pub/php-func-lib lib
|
||||
|
||||
18
_func.php
18
_func.php
@@ -1,10 +1,10 @@
|
||||
<?php
|
||||
// include ('config.php');
|
||||
include_once ('sql.php');
|
||||
$sql = new SQL ();
|
||||
include_once ('string.php');
|
||||
include_once ('numbers.php');
|
||||
include_once ('mail.php');
|
||||
include_once ('debug.php');
|
||||
include_once ('markdown.php');
|
||||
<?php
|
||||
// include ('config.php');
|
||||
include_once ('sql.php');
|
||||
$sql = new SQL ();
|
||||
include_once ('string.php');
|
||||
include_once ('numbers.php');
|
||||
include_once ('mail.php');
|
||||
include_once ('debug.php');
|
||||
include_once ('markdown.php');
|
||||
?>
|
||||
Reference in New Issue
Block a user