Conflicts: bureau/class/config.php bureau/class/db_mysql.php bureau/class/m_action.php bureau/class/m_variables.php |
||
|---|---|---|
| .. | ||
| lib | ||
| tests | ||
| .gitignore | ||
| AutoLoader.php | ||
| bootstrap.php | ||
| local.sh_generic | ||
| my.cnf_generic | ||
| phpunit.xml | ||
Conflicts: bureau/class/config.php bureau/class/db_mysql.php bureau/class/m_action.php bureau/class/m_variables.php |
||
|---|---|---|
| .. | ||
| lib | ||
| tests | ||
| .gitignore | ||
| AutoLoader.php | ||
| bootstrap.php | ||
| local.sh_generic | ||
| my.cnf_generic | ||
| phpunit.xml | ||