bc178983b3
Conflicts: doc/ChangeLog |
||
---|---|---|
.. | ||
locales | ||
templates | ||
.gitignore | ||
config.default.php | ||
config.php.dist | ||
tables.sql |
bc178983b3
Conflicts: doc/ChangeLog |
||
---|---|---|
.. | ||
locales | ||
templates | ||
.gitignore | ||
config.default.php | ||
config.php.dist | ||
tables.sql |