Age | Commit message (Collapse) | Author | Files | Lines |
|
Conflicts resolved:
.travis.yml
system/core/CodeIgniter.php
system/database/drivers/oci8/oci8_forge.php
system/database/drivers/pdo/subdrivers/pdo_oci_forge.php
system/helpers/path_helper.php
system/libraries/Email.php
user_guide_src/source/changelog.rst
user_guide_src/source/conf.py
user_guide_src/source/contributing/index.rst
user_guide_src/source/general/requirements.rst
user_guide_src/source/general/styleguide.rst
user_guide_src/source/installation/downloads.rst
user_guide_src/source/installation/upgrade_310.rst
user_guide_src/source/installation/upgrading.rst
|
|
|
|
|
|
Resolved conflicts:
system/core/CodeIgniter.php
user_guide_src/source/changelog.rst
user_guide_src/source/conf.py
user_guide_src/source/installation/downloads.rst
user_guide_src/source/installation/upgrading.rst
|
|
Closes #4462
|
|
Close #4311
|
|
|
|
[ci skip] Fix mismatched brackets in documentation
|
|
Sphinx generates incomplete/incorrect HTML output because there are
mismatched brackets in the documentation.
Signed-off-by: Phil Scherer <pscher1@umbc.edu>
|
|
|
|
|
|
|
|
|
|
First stab at DB driver reference. Methods are listed in order encountered in the source file.
Parameter or return types in DB_driver updated as needed, and reflected here.
TOC entry added to bottom of database index page.
Signed-off-by:James L Parry <jim_parry@bcit.ca>
|