diff options
| author | Jonatas Miguel <jonatas.df.miguel@gmail.com> | 2012-10-24 19:30:36 +0200 |
|---|---|---|
| committer | Jonatas Miguel <jonatas.df.miguel@gmail.com> | 2012-10-24 19:30:36 +0200 |
| commit | b51823dde5fbae508b8ebf99258d2f514a8bece8 (patch) | |
| tree | 4db09a22f85e0ddf151c940cd3e6fbaa799b8513 /user_guide_src/source/overview/index.rst | |
| parent | a53f402b78ad07fb0f6da19cff0c7bec3a09a4c0 (diff) | |
| parent | a7001e968a4791312391eb245ad84888893cda8f (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Conflicts:
user_guide_src/source/changelog.rst
Diffstat (limited to 'user_guide_src/source/overview/index.rst')
| -rw-r--r-- | user_guide_src/source/overview/index.rst | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/user_guide_src/source/overview/index.rst b/user_guide_src/source/overview/index.rst index dc91f78c4..d48a0bbe4 100644 --- a/user_guide_src/source/overview/index.rst +++ b/user_guide_src/source/overview/index.rst @@ -9,7 +9,6 @@ The following pages describe the broad concepts behind CodeIgniter: Getting Started <getting_started> CodeIgniter at a Glance <at_a_glance> - CodeIgniter Cheatsheets <cheatsheets> Supported Features <features> Application Flow Chart <appflow> Model-View-Controller <mvc> |