summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/changelog.rst
AgeCommit message (Collapse)AuthorFilesLines
2011-10-05Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developDerek Jones1-0/+1
Conflicts: user_guide/changelog.html
2011-10-05replacing the old HTML user guide with a Sphinx-managed user guideDerek Jones1-0/+2177