diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-04-26 23:15:36 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-04-26 23:15:36 +0200 |
| commit | ba4636187a745a287c81517fbc53f2f30fe16d88 (patch) | |
| tree | bdcb56cc80e72735d0118f3abf91e04f0dfba5cd /user_guide_src/source/overview | |
| parent | cdfbd5281e4dec7278a07943832c2590c1141eb3 (diff) | |
| parent | f3b0074b0ccaadef31737cbd6be21ec7272f7538 (diff) | |
Fixed conflicts.
Diffstat (limited to 'user_guide_src/source/overview')
| -rw-r--r-- | user_guide_src/source/overview/features.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/user_guide_src/source/overview/features.rst b/user_guide_src/source/overview/features.rst index 44db08a94..8c27b1436 100644 --- a/user_guide_src/source/overview/features.rst +++ b/user_guide_src/source/overview/features.rst @@ -15,7 +15,7 @@ CodeIgniter's main features. - Model-View-Controller Based System - Extremely Light Weight - Full Featured database classes with support for several platforms. -- Active Record Database Support +- Query Builder Database Support - Form and Data Validation - Security and XSS Filtering - Session Management |